dwindows: gtk3/dw.c annotate

annotate gtk3/dw.c @ 2929:2ab97b349958

C++: Add Page 3 - Tree to dwtestoo.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 30 Dec 2022 09:35:00 +0000
parents	3fe7641f027c
children	edb4307ac7ce

rev	line source
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 * Dynamic Windows:
1386 fd1de4e9e542 Updated the readme and comments in the source files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1384 diff changeset	3 * A GTK like cross-platform GUI
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 * GTK3 forwarder module for portabilty.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5 *
2751 ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2750 diff changeset	6 * (C) 2000-2022 Brian Smith <brian@dbsoft.org>
ee1cfa7d645e Update copyright dates for the new year 2022. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2750 diff changeset	7 * (C) 2003-2022 Mark Hessling <mark@rexx.org>
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9 */
2160 07f1366a724c Rename config.h(.in) to dwconfig.h and install it with dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2159 diff changeset	10 #include "dwconfig.h"
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 #include "dw.h"
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	12 #include <glib/gi18n.h>
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #include <string.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	14 #include <stdlib.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	15 #if !defined(GDK_WINDOWING_WIN32)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	16 # include <sys/utsname.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17 # include <sys/socket.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	18 # include <sys/un.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	19 # include <sys/mman.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	20 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21 #include <stdarg.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	22 #include <stdio.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	23 #include <unistd.h>
1001 4ef0e878fe06 Added support for Dynamic Windows style font names for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 998 diff changeset	24 #include <ctype.h>
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	25 #include <errno.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	26 #include <sys/time.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	27 #include <dirent.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	28 #include <sys/stat.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	29 #include <signal.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	30 #include <fcntl.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	31 #include <unistd.h>
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	32 #include <math.h>
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	33 #include <gdk/gdkkeysyms.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	34
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	35
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	36 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	37 #include <webkit2/webkit2.h>
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	38 #if !WEBKIT_CHECK_VERSION(2, 22, 0)
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	39 #include <JavaScriptCore/JavaScript.h>
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	40 #endif
2056 29305f8abae3 GTK3: Fix building with no webkit libraries installed at all. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2053 diff changeset	41 #elif defined(USE_WEBKIT)
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	42 #include <webkit/webkit.h>
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	43 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	44
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	45 #include <gdk-pixbuf/gdk-pixbuf.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	46
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	47 #ifdef __FreeBSD__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	48 #include <sys/param.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	49 #include <sys/sysctl.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	50 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	51
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	52 #if !GTK_CHECK_VERSION(3,1,0)
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	53 #error GTK 3.0 is no longer supported, please use 3.2 or later.
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	54 #endif
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	55
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	56 #if __STDC_VERSION__ < 199901L
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	57 # if __GNUC__ >= 2
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	58 # define __func__ __FUNCTION__
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	59 # else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	60 # define __func__ "<unknown>"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	61 # endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	62 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	63
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	64 /* These are used for legacy resource management
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	65 * Starting with Dynamic Windows 3.1 the default
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	66 * compiled in resource management is GResource.
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	67 */
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	68 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	69 #if defined(DW_RESOURCES) && !defined(BUILD_DLL)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	70 extern DWResources _resources;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	71 #endif
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	72 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	73
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	74 /* ff = 255 = 1.0000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	75 * ee = 238 = 0.9333
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	76 * cc = 204 = 0.8000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	77 * bb = 187 = 0.7333
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	78 * aa = 170 = 0.6667
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	79 * 77 = 119 = 0.4667
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	80 * 00 = 0 = 0.0000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	81 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	82 GdkRGBA _dw_colors[] =
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	83 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	84 { 0.0000, 0.0000, 0.0000, 1.0 }, /* 0 black */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	85 { 0.7333, 0.0000, 0.0000, 1.0 }, /* 1 red */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	86 { 0.0000, 0.7333, 0.0000, 1.0 }, /* 2 green */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	87 { 0.6667, 0.6667, 0.0000, 1.0 }, /* 3 yellow */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	88 { 0.0000, 0.0000, 0.8000, 1.0 }, /* 4 blue */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	89 { 0.7333, 0.0000, 0.7333, 1.0 }, /* 5 magenta */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	90 { 0.0000, 0.7333, 0.7333, 1.0 }, /* 6 cyan */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	91 { 0.7333, 0.7333, 0.7333, 1.0 }, /* 7 white */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	92 { 0.4667, 0.4667, 0.4667, 1.0 }, /* 8 grey */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	93 { 1.0000, 0.0000, 0.0000, 1.0 }, /* 9 bright red */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	94 { 0.0000, 1.0000, 0.0000, 1.0 }, /* 10 bright green */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	95 { 0.9333, 0.9333, 0.0000, 1.0 }, /* 11 bright yellow */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	96 { 0.0000, 0.0000, 1.0000, 1.0 }, /* 12 bright blue */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	97 { 1.0000, 0.0000, 1.0000, 1.0 }, /* 13 bright magenta */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	98 { 0.0000, 0.9333, 0.9333, 1.0 }, /* 14 bright cyan */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	99 { 1.0000, 1.0000, 1.0000, 1.0 }, /* 15 bright white */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	100 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	101
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	102 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	103 * List those icons that have transparency first
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	104 */
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	105 #define NUM_EXTS 9
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	106 char *_dw_image_exts[NUM_EXTS] =
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	107 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	108 ".xpm",
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	109 ".png",
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	110 ".ico",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	111 ".icns",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	112 ".gif",
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	113 ".jpg",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	114 ".jpeg",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	115 ".tiff",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	116 ".bmp"
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	117 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	118
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	119 #ifndef max
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	120 # define max(a,b) (((a) > (b)) ? (a) : (b))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	121 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	123 #ifndef min
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	124 # define min(a,b) (((a) < (b)) ? (a) : (b))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	125 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	126
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	127 static pthread_key_t _dw_fg_color_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	128 static pthread_key_t _dw_bg_color_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	129 static pthread_key_t _dw_mutex_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	130
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	131 static GList *_dw_dirty_list = NULL;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	132
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	133 static GtkWidget *_dw_popup = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	134
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	135 static int _dw_ignore_click = 0, _dw_ignore_expand = 0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	136 static pthread_t _dw_thread = (pthread_t)-1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	137
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	138 void (*_dw_gdk_threads_init)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	139 void (*_dw_gdk_threads_enter)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	140 void (*_dw_gdk_threads_leave)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	141
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	142 #define DW_MUTEX_LOCK { if(pthread_self() != _dw_thread && !pthread_getspecific(_dw_mutex_key)) { _dw_gdk_threads_enter(); pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me); _dw_locked_by_me = TRUE; } }
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	143 #define DW_MUTEX_UNLOCK { if(pthread_self() != _dw_thread && _dw_locked_by_me == TRUE) { _dw_gdk_threads_leave(); pthread_setspecific(_dw_mutex_key, NULL); _dw_locked_by_me = FALSE; } }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	144
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	145 #define DEFAULT_SIZE_WIDTH 12
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	146 #define DEFAULT_SIZE_HEIGHT 6
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	147 #define DEFAULT_TITLEBAR_HEIGHT 22
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	148
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	149 #define _DW_TREE_TYPE_CONTAINER 1
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	150 #define _DW_TREE_TYPE_TREE 2
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	151 #define _DW_TREE_TYPE_LISTBOX 3
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	152 #define _DW_TREE_TYPE_COMBOBOX 4
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	153
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	154 /* Signal forwarder prototypes */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	155 static gint _dw_button_press_event(GtkWidget widget, GdkEventButton event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	156 static gint _dw_button_release_event(GtkWidget widget, GdkEventButton event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	157 static gint _dw_motion_notify_event(GtkWidget widget, GdkEventMotion event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	158 static gint _dw_delete_event(GtkWidget widget, GdkEvent event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	159 static gint _dw_key_press_event(GtkWidget widget, GdkEventKey event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	160 static gint _dw_generic_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	161 static gint _dw_configure_event(GtkWidget widget, GdkEventConfigure event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	162 static gint _dw_activate_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	163 static gint _dw_container_enter_event(GtkWidget widget, GdkEventAny event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	164 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	165 static gint _dw_expose_event(GtkWidget widget, cairo_t cr, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	166 static gint _dw_set_focus_event(GtkWindow window, GtkWidget widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	167 static gint _dw_tree_context_event(GtkWidget widget, GdkEventButton event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	168 static gint _dw_value_changed_event(GtkWidget *widget, gpointer user_data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	169 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	170 static gint _dw_tree_expand_event(GtkTreeView treeview, GtkTreeIter arg1, GtkTreePath *arg2, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	171 static gint _dw_switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	172 static gint _dw_column_click_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	173 static void _dw_html_result_event(GObject object, GAsyncResult result, gpointer script_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	174 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	175 #ifdef USE_WEBKIT2
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	176 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	177 #else
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	178 static void _dw_html_changed_event(WebKitWebView web_view, WebKitWebFrame frame, gpointer user_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	179 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	180 #endif
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	181 static void _dw_signal_disconnect(gpointer data, GClosure *closure);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	182
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	183 GObject *_DWObject = NULL;
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	184 #if GLIB_CHECK_VERSION(2,28,0)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	185 GApplication *_DWApp = NULL;
2211 9395c1efa98b GTK: _dw_app_id[] is not used with glib prior to 2.28 so move it into #ifdef bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2210 diff changeset	186 static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 };
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	187 #endif
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	188 char *_DWDefaultFont = NULL;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	189 static char _dw_share_path[PATH_MAX+1] = { 0 };
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	191 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	192 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	193 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	194 char name[30];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	195
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	196 } DWSignalList;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	197
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	198 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	199 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	200 HWND window;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	201 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	202 gpointer data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	203 gint cid;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	204 void *intfunc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	205
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	206 } DWSignalHandler;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	207
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	208 #define SIGNALMAX 20
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	210 /* A list of signal forwarders, to account for paramater differences. */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	211 static DWSignalList DWSignalTranslate[SIGNALMAX] = {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	212 { _dw_configure_event, DW_SIGNAL_CONFIGURE },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	213 { _dw_key_press_event, DW_SIGNAL_KEY_PRESS },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	214 { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	215 { _dw_button_release_event, DW_SIGNAL_BUTTON_RELEASE },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	216 { _dw_motion_notify_event, DW_SIGNAL_MOTION_NOTIFY },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	217 { _dw_delete_event, DW_SIGNAL_DELETE },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	218 { _dw_expose_event, DW_SIGNAL_EXPOSE },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	219 { _dw_activate_event, "activate" },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	220 { _dw_generic_event, DW_SIGNAL_CLICKED },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	221 { _dw_container_enter_event, DW_SIGNAL_ITEM_ENTER },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	222 { _dw_tree_context_event, DW_SIGNAL_ITEM_CONTEXT },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	223 { _dw_combobox_select_event, DW_SIGNAL_LIST_SELECT },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	224 { _dw_tree_select_event, DW_SIGNAL_ITEM_SELECT },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	225 { _dw_set_focus_event, DW_SIGNAL_SET_FOCUS },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	226 { _dw_value_changed_event, DW_SIGNAL_VALUE_CHANGED },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	227 { _dw_switch_page_event, DW_SIGNAL_SWITCH_PAGE },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	228 { _dw_column_click_event, DW_SIGNAL_COLUMN_CLICK },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	229 { _dw_tree_expand_event, DW_SIGNAL_TREE_EXPAND },
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	230 #ifdef USE_WEBKIT
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	231 { _dw_html_changed_event, DW_SIGNAL_HTML_CHANGED },
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	232 #else
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	233 { _dw_generic_event, DW_SIGNAL_HTML_CHANGED },
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	234 #endif
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	235 { _dw_html_result_event, DW_SIGNAL_HTML_RESULT }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	236 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	237
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	238 /* Alignment flags */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	239 #define DW_CENTER 0.5f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	240 #define DW_LEFT 0.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	241 #define DW_RIGHT 1.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	242 #define DW_TOP 0.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	243 #define DW_BOTTOM 1.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	244
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	245 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	246 /* MDI Support Code */
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	247 static void _dw_override_color(GtkWidget widget, const char element, GdkRGBA *color);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	248 static void _dw_override_font(GtkWidget widget, const char font);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	249 #define GTK_MDI(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_mdi_get_type (), GtkMdi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	250 #define GTK_MDI_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_mdi_get_type (), GtkMdiClass)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	251 #define GTK_IS_MDI(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_mdi_get_type ())
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	252
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	253 typedef struct _GtkMdi GtkMdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	254 typedef struct _GtkMdiClass GtkMdiClass;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	255 typedef struct _GtkMdiDragInfo GtkMdiDragInfo;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	256 typedef enum _GtkMdiChildState GtkMdiChildState;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	258 enum _GtkMdiChildState
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	259 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	260 CHILD_NORMAL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	261 CHILD_MAXIMIZED,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	262 CHILD_ICONIFIED
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	263 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	265 struct _GtkMdi
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	266 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	267 GtkContainer container;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	268 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	269
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	270 GdkPoint drag_start;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	271 gint drag_button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	272 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	273
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	274 struct _GtkMdiClass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	275 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	276 GtkContainerClass parent_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	277
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	278 void (mdi) (GtkMdi mdi);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	279 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	281 #include "gtk/maximize.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	282 #include "gtk/minimize.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	283 #include "gtk/kill.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	284
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	285 #define GTK_MDI_BACKGROUND "Grey70"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	286 #define GTK_MDI_LABEL_BACKGROUND "RoyalBlue4"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	287 #define GTK_MDI_LABEL_FOREGROUND "white"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	288 #define GTK_MDI_DEFAULT_WIDTH 0
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	289 #define GTK_MDI_DEFAULT_HEIGHT 0
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	290 #define GTK_MDI_MIN_HEIGHT 22
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	291 #define GTK_MDI_MIN_WIDTH 55
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	292
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	293 typedef struct _GtkMdiChild GtkMdiChild;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	295 struct _GtkMdiChild
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	296 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	297 GtkWidget *widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	298
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	299 GtkWidget *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	300 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	302 gint x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	303 gint y;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	304 gint width;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	305 gint height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	306
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	307 GtkMdiChildState state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	308 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	309
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	310 static void gtk_mdi_class_init(GtkMdiClass *klass);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	311 static void gtk_mdi_init(GtkMdi *mdi);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	312
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	313 static void gtk_mdi_realize(GtkWidget *widget);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	314 static void gtk_mdi_size_allocate(GtkWidget widget, GtkAllocation allocation);
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	315 static gboolean gtk_mdi_draw(GtkWidget widget, cairo_t cr);
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	316 static void gtk_mdi_get_preferred_width (GtkWidget widget, gint minimum_width, gint *natural_width);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	317 static void gtk_mdi_get_preferred_height (GtkWidget widget, gint minimum_height, gint *natural_height);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	318
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319 /* Callbacks */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	320 static gboolean _dw_mdi_move_child_callback(GtkWidget widget, GdkEvent event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	321 static gboolean _dw_mdi_resize_child_callback(GtkWidget widget, GdkEvent event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	322 static gboolean _dw_mdi_iconify_child_callback(GtkWidget widget, GdkEvent event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	323 static gboolean _dw_mdi_maximize_child_callback(GtkWidget widget, GdkEvent event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	324 static gboolean _dw_mdi_kill_child_callback(GtkWidget widget, GdkEvent event, gpointer data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	326 static void gtk_mdi_add(GtkContainer container, GtkWidget widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	327 static void gtk_mdi_remove_true(GtkContainer container, GtkWidget widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	328 static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	329
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	330 static GtkMdiChild _dw_mdi_get_child(GtkMdi mdi, GtkWidget * widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	331
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	332 static GType gtk_mdi_get_type(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	333 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	334 static GType mdi_type = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	336 if (!mdi_type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	337 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	338
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	339 static const GTypeInfo mdi_info =
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	340 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	341 sizeof (GtkMdiClass),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	342 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	343 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	344 (GClassInitFunc) gtk_mdi_class_init,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	345 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	346 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	347 sizeof (GtkMdi),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	348 0,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	349 (GInstanceInitFunc) gtk_mdi_init,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	350 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	351
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	352 mdi_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkMdi", &mdi_info, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	353 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	354 return mdi_type;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	355 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	356
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	357 /* Local data */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	358 static GtkWidgetClass *parent_class = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	359
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	360 static void gtk_mdi_class_init(GtkMdiClass *class)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	361 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	362 GtkWidgetClass *widget_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	363 GtkContainerClass *container_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	365 widget_class = (GtkWidgetClass *) class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	366 container_class = (GtkContainerClass *) class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	367
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	368 parent_class = g_type_class_ref (GTK_TYPE_CONTAINER);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	370 widget_class->realize = gtk_mdi_realize;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	371 widget_class->draw = gtk_mdi_draw;
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	372 widget_class->get_preferred_height = gtk_mdi_get_preferred_height;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	373 widget_class->get_preferred_width = gtk_mdi_get_preferred_width;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	374 widget_class->size_allocate = gtk_mdi_size_allocate;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	376 container_class->add = gtk_mdi_add;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	377 container_class->remove = gtk_mdi_remove_true;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	378 container_class->forall = gtk_mdi_forall;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	379 class->mdi = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	380 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	381
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	382 static void gtk_mdi_init(GtkMdi *mdi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	383 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	384 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	385 mdi->children = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	386 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	387
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	388 static GtkWidget *gtk_mdi_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	389 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	390 GtkWidget *mdi;
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	391 GdkRGBA background;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	392
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	393 mdi = GTK_WIDGET (g_object_new (gtk_mdi_get_type (), NULL));
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	394 gdk_rgba_parse (&background, GTK_MDI_BACKGROUND);
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	395 _dw_override_color (mdi, "background-color", &background);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	396
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	397 return mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	398 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	399
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	400 static void gtk_mdi_put(GtkMdi mdi, GtkWidget child_widget, gint x, gint y, GtkWidget *label)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	401 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	402 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	403
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	404 GtkWidget *grid;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	405 GtkWidget *button[3];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	406
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	407 GtkWidget *child_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	408 GtkWidget *top_event_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	409 GtkWidget *bottom_event_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	410 GtkWidget *child_widget_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	411 GtkWidget *image;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	412
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	413 GdkRGBA color;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	414 gint i, j;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	415 GdkCursor *cursor;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	416 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	417
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	418 child_box = gtk_event_box_new ();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419 child_widget_box = gtk_event_box_new ();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	420 #if GTK_CHECK_VERSION(3,12,0)
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	421 gtk_widget_set_margin_start(child_widget_box, 2);
1921 bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	422 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	423 gtk_widget_set_margin_left(child_widget_box, 2);
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	424 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	425 top_event_box = gtk_event_box_new ();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	426 bottom_event_box = gtk_event_box_new ();
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	427 grid = gtk_grid_new ();
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	428 gtk_grid_set_row_spacing(GTK_GRID(grid), 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	429 gtk_grid_set_column_spacing(GTK_GRID(grid), 1);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	430
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	431 for (i = 0; i < 3; i++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	432 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	433 button[i] = gtk_event_box_new ();
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	434 gtk_widget_set_events (button[i], GDK_BUTTON_PRESS_MASK);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	435 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	436
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	437 gdk_rgba_parse (&color, GTK_MDI_LABEL_BACKGROUND);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	438
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	439 _dw_override_color (top_event_box, "background-color", &color);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	440 _dw_override_color (bottom_event_box, "background-color", &color);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	441 _dw_override_color (child_box, "background-color", &color);
1894 ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1892 diff changeset	442 for (j = 0; j < 3; j++)
ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1892 diff changeset	443 {
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	444 _dw_override_color (button[j], "background-color", &color);
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	445 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	446 gdk_rgba_parse (&color, GTK_MDI_LABEL_FOREGROUND);
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	447 _dw_override_color (label, "color", &color);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	448 #if GTK_CHECK_VERSION(3,16,0)
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	449 gtk_label_set_xalign(GTK_LABEL(label), 0.0f);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	450 gtk_label_set_yalign(GTK_LABEL(label), 0.5f);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	451 #else
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	452 gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	453 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	454
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	455 gtk_container_add (GTK_CONTAINER (top_event_box), label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	456 gtk_container_add (GTK_CONTAINER (child_widget_box), child_widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	457 gtk_widget_set_size_request (bottom_event_box, 2, 2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	458
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	459
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	460 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **)minimize_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	461 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	462 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	463 gtk_container_add (GTK_CONTAINER (button[0]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	464 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) maximize_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	465 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	466 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	467 gtk_container_add (GTK_CONTAINER (button[1]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	468 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) kill_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	469 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	470 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	471 gtk_container_add (GTK_CONTAINER (button[2]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	472
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	473
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	474 /* Titlebar and buttons */
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	475 gtk_widget_set_hexpand(top_event_box, TRUE);
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	476 gtk_grid_attach (GTK_GRID (grid), top_event_box, 0, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	477 gtk_grid_attach (GTK_GRID (grid), button[0], 1, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	478 gtk_grid_attach (GTK_GRID (grid), button[1], 2, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	479 gtk_grid_attach (GTK_GRID (grid), button[2], 3, 0, 1, 1);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	480
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	481 /* Window contents */
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	482 gtk_widget_set_hexpand(child_widget_box, TRUE);
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	483 gtk_widget_set_vexpand(child_widget_box, TRUE);
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	484 gtk_grid_attach (GTK_GRID (grid), child_widget_box, 0, 1, 4, 1);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	485
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	486 /* Bottom border */
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	487 gtk_grid_attach (GTK_GRID (grid), bottom_event_box, 4, 2, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	488
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	489 gtk_container_add (GTK_CONTAINER (child_box), grid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	490
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	491 child = g_new (GtkMdiChild, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	492 child->widget = child_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	493 child->x = x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	494 child->y = y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	495 child->width = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	496 child->height = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	497 child->child = child_widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	498 child->mdi = mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	499 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	500
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	501 gtk_widget_set_parent (child_box, GTK_WIDGET (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	502 mdi->children = g_list_append (mdi->children, child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	504 gtk_widget_show (child_box);
1577 fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	505 gtk_widget_show (grid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	506 gtk_widget_show (top_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	507 gtk_widget_show (bottom_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	508 gtk_widget_show (child_widget_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	509 for (i = 0; i < 3; i++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	511 gtk_widget_show (button[i]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	512 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	513
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	514 cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_HAND1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	515 gtk_widget_realize (top_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	516 gdk_window_set_cursor (gtk_widget_get_window(top_event_box), cursor);
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	517 cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_BOTTOM_RIGHT_CORNER);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	518 gtk_widget_realize (bottom_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	519 gdk_window_set_cursor (gtk_widget_get_window(bottom_event_box), cursor);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	520
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	521 g_signal_connect (G_OBJECT (top_event_box), "event",
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	522 G_CALLBACK (_dw_mdi_move_child_callback),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	523 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	524 g_signal_connect (G_OBJECT (bottom_event_box), "event",
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	525 G_CALLBACK (_dw_mdi_resize_child_callback),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	526 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	527 g_signal_connect (G_OBJECT (button[0]), "button_press_event",
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	528 G_CALLBACK (_dw_mdi_iconify_child_callback),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	529 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	530 g_signal_connect (G_OBJECT (button[1]), "button_press_event",
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	531 G_CALLBACK (_dw_mdi_maximize_child_callback),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	532 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	533 g_signal_connect (G_OBJECT (button[2]), "button_press_event",
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	534 G_CALLBACK (_dw_mdi_kill_child_callback),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	535 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	536 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	538 static void gtk_mdi_move(GtkMdi mdi, GtkWidget widget, gint x, gint y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	539 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	540 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	541
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	542 g_return_if_fail(GTK_IS_MDI(mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	543 g_return_if_fail(GTK_IS_WIDGET(widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	544
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	545 child = _dw_mdi_get_child(mdi, widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	546 g_return_if_fail(child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	548 child->x = x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	549 child->y = y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	550 if (gtk_widget_get_visible(widget) && gtk_widget_get_visible(GTK_WIDGET(mdi)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	551 gtk_widget_queue_resize(GTK_WIDGET(widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	552 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	554 static void gtk_mdi_get_pos(GtkMdi mdi, GtkWidget widget, gint x, gint y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	555 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	556 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	557
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	558 g_return_if_fail(GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 g_return_if_fail(GTK_IS_WIDGET (widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	560
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	561 child = _dw_mdi_get_child(mdi, widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	562 g_return_if_fail(child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	563
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	564 *x = child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	565 *y = child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	566 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	567
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	568 static void gtk_mdi_set_state(GtkMdi mdi, GtkWidget widget, GtkMdiChildState state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	569 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	570 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	571
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	572 g_return_if_fail (GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	573 g_return_if_fail (GTK_IS_WIDGET (widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	574
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	575 child = _dw_mdi_get_child (mdi, widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	576 g_return_if_fail (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	577
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	578 child->state = state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	579 if (gtk_widget_get_visible(child->widget) && gtk_widget_get_visible(GTK_WIDGET(mdi)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	580 gtk_widget_queue_resize(GTK_WIDGET(child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	581 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	582
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	583 static void gtk_mdi_remove(GtkMdi mdi, GtkWidget widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	584 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	585 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	586
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	587 g_return_if_fail (GTK_IS_MDI (mdi));
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	588 child = _dw_mdi_get_child (mdi, widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	589 g_return_if_fail (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	590 gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	591 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	592
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	593 static void gtk_mdi_realize(GtkWidget *widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	594 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	595 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	596 GdkWindowAttr attributes;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	597 gint attributes_mask;
1185 415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1177 diff changeset	598 GdkWindow *thiswindow;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	599 GtkAllocation allocation;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	601 mdi = GTK_MDI (widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	602
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	603 g_return_if_fail (widget != NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	604 g_return_if_fail (GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	605
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	606 gtk_widget_set_realized(widget, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	607
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	608 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	609 attributes.x = allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	610 attributes.y = allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	611 attributes.width = allocation.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	612 attributes.height = allocation.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 attributes.wclass = GDK_INPUT_OUTPUT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614 attributes.window_type = GDK_WINDOW_CHILD;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	615 attributes.event_mask = gtk_widget_get_events (widget) \|
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	616 GDK_EXPOSURE_MASK \| GDK_BUTTON_PRESS_MASK \|
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	617 GDK_BUTTON_RELEASE_MASK \| GDK_POINTER_MOTION_MASK \|
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	618 GDK_POINTER_MOTION_HINT_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	619 attributes.visual = gtk_widget_get_visual (widget);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	620
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	621 attributes_mask = GDK_WA_X \| GDK_WA_Y \| GDK_WA_VISUAL;
1185 415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1177 diff changeset	622 thiswindow = gdk_window_new (gtk_widget_get_parent_window(widget), &attributes, attributes_mask);
415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1177 diff changeset	623 gtk_widget_set_window(widget, thiswindow);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	624
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	625 gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	626 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	628 static void gtk_mdi_get_preferred_width (GtkWidget widget, gint minimum_width, gint *natural_width)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	629 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	630 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	631 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	632 GList *children;
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	633 gint child_minimum_width, child_natural_width;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	634
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	635 mdi = GTK_MDI (widget);
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	636 natural_width = minimum_width = GTK_MDI_DEFAULT_WIDTH;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	637
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	638 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	639 while(children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	640 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	641 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	642 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	643
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	644 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	645 {
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	646 gtk_widget_get_preferred_width(child->widget, &child_minimum_width, &child_natural_width);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	647 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	648 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	649 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	650
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	651 static void gtk_mdi_get_preferred_height (GtkWidget widget, gint minimum_height, gint *natural_height)
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	652 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	653 GtkMdi *mdi;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	654 GtkMdiChild *child;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	655 GList *children;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	656 gint child_minimum_height, child_natural_height;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	657
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	658 mdi = GTK_MDI (widget);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	659 natural_height = minimum_height = GTK_MDI_DEFAULT_HEIGHT;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	660
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	661 children = mdi->children;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	662 while(children)
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	663 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	664 child = children->data;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	665 children = children->next;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	666
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	667 if(gtk_widget_get_visible(child->widget))
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	668 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	669 gtk_widget_get_preferred_height(child->widget, &child_minimum_height, &child_natural_height);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	670 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	671 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	672 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	673
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	674 static void gtk_mdi_size_allocate(GtkWidget widget, GtkAllocation allocation)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	675 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	676 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	677 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	678 GtkAllocation child_allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	679 GtkRequisition child_requisition;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	680 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	681
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	682 mdi = GTK_MDI (widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	684 gtk_widget_set_allocation(widget, allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	685
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	686 if(gtk_widget_get_realized(widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	687 gdk_window_move_resize (gtk_widget_get_window(widget),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 allocation->x,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 allocation->y,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	690 allocation->width,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	691 allocation->height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	692
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	693
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	694 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	695 while(children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	696 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	697 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	698 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	700 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	701 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	702 gtk_widget_get_preferred_size (child->widget, NULL, &child_requisition);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	703 child_allocation.x = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	704 child_allocation.y = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	705 switch (child->state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	706 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	707 case CHILD_NORMAL:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	708 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	709 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	710 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	711 child_allocation.width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	712 child_allocation.height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	713 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	714 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	715 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	716 child_allocation.width = child->width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	717 child_allocation.height = child->height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	718 child->width = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	719 child->height = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	720 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	721 child_allocation.x += child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	722 child_allocation.y += child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	723 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	724 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	725 case CHILD_MAXIMIZED:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	726 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	727 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	728 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	729 child->width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730 child->height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	731 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	732 child_allocation.width = allocation->width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	733 child_allocation.height = allocation->height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	734 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	735 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	736 case CHILD_ICONIFIED:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	737 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	738 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	739 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	740 child->width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	741 child->height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743 child_allocation.x += child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	744 child_allocation.y += child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	745 child_allocation.width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	746 child_allocation.height = GTK_MDI_MIN_HEIGHT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	747 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	748 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	749 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	750 gtk_widget_size_allocate (child->widget, &child_allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	751 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	752 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	754
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	755 static gboolean gtk_mdi_draw(GtkWidget widget, cairo_t cr)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	756 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	757 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	758 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	759 GtkMdi *mdi;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	760 GtkStyleContext *context;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	761
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	762 g_return_val_if_fail (widget != NULL, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	763 g_return_val_if_fail (GTK_IS_MDI (widget), FALSE);
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	764 g_return_val_if_fail (cr != NULL, FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	765
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	766 mdi = GTK_MDI (widget);
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	767
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	768 if((context = gtk_widget_get_style_context(widget)))
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	769 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	770 GtkAllocation allocation;
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	771
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	772 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	773 gtk_render_background (context, cr, 0, 0, allocation.x, allocation.y);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	774 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	775
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	776 for (children = mdi->children; children; children = children->next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	777 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	778 child = (GtkMdiChild *) children->data;
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	779 gtk_container_propagate_draw (GTK_CONTAINER (mdi),
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	780 child->widget,
836 28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	781 cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	782 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	783 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	784 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	785
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	786 static void gtk_mdi_add(GtkContainer container, GtkWidget widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	787 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	788 GtkWidget *label;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	789 label = gtk_label_new ("");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790 gtk_mdi_put (GTK_MDI (container), widget, 0, 0, label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	791 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	793 static void gtk_mdi_remove_true(GtkContainer container, GtkWidget widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	794 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	795 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	796 GtkMdiChild *child = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	797 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	798
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	799 mdi = GTK_MDI (container);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	800
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	801 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	802 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	803 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	804 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	805 if (child->widget == widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	806 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	807
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	808 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	809 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	810
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	811 if(child)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	812 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	813 gtk_widget_unparent (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	814 g_free (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	815 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	816 mdi->children = g_list_remove_link (mdi->children, children);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	817 g_list_free (children);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	818 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	819
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	820 static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	821 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	822 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	823 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	824 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	826 g_return_if_fail (callback != NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	827
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	828 mdi = GTK_MDI (container);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	829
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	830 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	831 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	832 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	833 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	834 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	836 (*callback) (child->widget, callback_data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	837 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	838 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	839
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	840 static gboolean _dw_mdi_move_child_callback(GtkWidget widget, GdkEvent event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	841 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	842 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	843 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	846 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	847
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	848 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	849 g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	850
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	851
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	852 switch (event->type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	853 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	854 case GDK_2BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	855 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	856 gdk_window_raise (gtk_widget_get_window(child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	857 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	858 case GDK_BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	859 if (child->state == CHILD_MAXIMIZED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	860 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	861 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	862 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	863 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	864 if (gdk_seat_grab (gdk_event_get_seat(event),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	865 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	866 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	867 FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	868 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	869 if (gdk_device_grab (gdk_event_get_device(event),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	870 event->button.window,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	871 GDK_OWNERSHIP_WINDOW,
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	872 FALSE,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	873 GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \|
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	874 GDK_BUTTON_RELEASE_MASK,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	875 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	876 event->button.time) != GDK_GRAB_SUCCESS)
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	877 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	878 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	879
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	880 mdi->drag_button = event->button.button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	881
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	882 mdi->drag_start.x = event->button.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	883 mdi->drag_start.y = event->button.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	884 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	885 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	886
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	887 case GDK_BUTTON_RELEASE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	888 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	889 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	890
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	891 if (mdi->drag_button == event->button.button)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	893 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	894
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	895 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	896 gdk_seat_ungrab (gdk_event_get_seat(event));
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	897 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	898 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	899 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	901
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	902 x = event->button.x + child->x - mdi->drag_start.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	903 y = event->button.y + child->y - mdi->drag_start.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	905 gtk_mdi_move (mdi, child->child, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	906 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	908
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	909 case GDK_MOTION_NOTIFY:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	910 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	913 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	915
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	916 gdk_window_get_device_position (gtk_widget_get_window(widget), gdk_event_get_device(event), &x, &y, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919 x = x - mdi->drag_start.x + child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	920 y = y - mdi->drag_start.y + child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	921
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	922
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	923 gtk_mdi_move (mdi, child->child, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	924 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	925 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	926
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	927 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	928 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	929 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	931 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	932 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	933
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	934 static gboolean _dw_mdi_resize_child_callback(GtkWidget widget, GdkEvent event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	935 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	936 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	937 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	938
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	939 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	940 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	941
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	942 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	943 g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	945 switch (event->type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	946 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	947 case GDK_BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	948 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	949 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	950 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	951 if (gdk_seat_grab (gdk_event_get_seat(event),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	952 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	953 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	954 FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	955 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	956 if (gdk_device_grab (gdk_event_get_device(event),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	957 event->button.window,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	958 GDK_OWNERSHIP_WINDOW,
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	959 FALSE,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	960 GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK \|
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	961 GDK_BUTTON_RELEASE_MASK,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	962 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	963 event->button.time) != GDK_GRAB_SUCCESS)
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	964 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	965 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	966
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	967 mdi->drag_button = event->button.button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	968 if ((child->state == CHILD_MAXIMIZED) \|\| (child->state == CHILD_ICONIFIED))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	969 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	970 GtkAllocation allocation;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	971
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	972 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	973 gtk_widget_get_allocation(child->widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	974 child->x = allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	975 child->y = allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	976 child->width = allocation.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	977 child->height = allocation.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	978 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	979
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	980 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	983 case GDK_BUTTON_RELEASE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	984 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	985 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	986
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	987 if (mdi->drag_button == event->button.button)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	988 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	989 int width, height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	990 GtkAllocation allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	991
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	992 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	993 gdk_seat_ungrab (gdk_event_get_seat(event));
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	994 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	995 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	996 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	997 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	998
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	999 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1000 width = event->button.x + allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1001 height = event->button.y + allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1002
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1003 width = MAX (width, GTK_MDI_MIN_WIDTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1004 height = MAX (height, GTK_MDI_MIN_HEIGHT);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1005
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1006 gtk_widget_set_size_request (child->widget, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1007 gtk_widget_queue_resize (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1009 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1010
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1011 case GDK_MOTION_NOTIFY:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1012 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1013 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1014 int width, height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1015 GtkAllocation allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1016
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1017 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1018 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1019
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1020 gdk_window_get_device_position (gtk_widget_get_window(widget), gdk_event_get_device(event), &x, &y, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1022 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1023 width = x + allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1024 height = y + allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1025
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1026 width = MAX (width, GTK_MDI_MIN_WIDTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1027 height = MAX (height, GTK_MDI_MIN_HEIGHT);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1028
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1029 gtk_widget_set_size_request (child->widget, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1030 gtk_widget_queue_resize (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1031 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1032 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1034 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1035 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1036 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1037
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1038 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1039 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1040
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1041 static gboolean _dw_mdi_iconify_child_callback (GtkWidget widget, GdkEvent event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1042 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1043 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1044 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1045 if(child->state == CHILD_ICONIFIED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1046 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1047 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1048 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1049 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1050 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1051 child->state = CHILD_ICONIFIED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1052 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1053 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1054 gtk_widget_queue_resize(GTK_WIDGET (child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1056 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1058 static gboolean _dw_mdi_maximize_child_callback (GtkWidget widget, GdkEvent event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1059 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1060 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1061 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1062 if (child->state == CHILD_MAXIMIZED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1063 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1064 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1065 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1066 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1067 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1068 child->state = CHILD_MAXIMIZED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1069 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1070 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1071 gtk_widget_queue_resize(GTK_WIDGET (child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1072 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1073 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1074
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1075 static gboolean _dw_mdi_kill_child_callback (GtkWidget widget, GdkEvent event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1076 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1077 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1078 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1079
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1080 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1081 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1082
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1083 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1084
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1086 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1087 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1088
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1089 static GtkMdiChild _dw_mdi_get_child (GtkMdi mdi, GtkWidget *widget)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1090 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1091 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1092
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1093 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1094 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1095 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1096 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1099 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1100
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1101 if (child->child == widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1102 return child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1103 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1104
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1105 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1106 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	1107 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1109 static void _dw_msleep(long period)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1110 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1111 #ifdef __sun__
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1112 /* usleep() isn't threadsafe on Solaris */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1113 struct timespec req;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1114
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1115 req.tv_sec = 0;
1463 77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1116 if(period >= 1000)
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1117 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1118 req.tv_sec = (int)(period / 1000);
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1119 period -= (req.tv_sec * 1000);
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1120 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1121 req.tv_nsec = period * 10000000;
1463 77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1122
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1123 nanosleep(&req, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1124 #else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1125 usleep(period * 1000);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1126 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1127 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1128
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1129 /* Finds the translation function for a given signal name */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1130 static void _dw_findsigfunc(const char signame)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1131 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1132 int z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1133
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1134 for(z=0;z<SIGNALMAX;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1135 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1136 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1137 return DWSignalTranslate[z].func;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1138 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1139 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1140 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1141
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1142 static DWSignalHandler _dw_get_signal_handler(gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1143 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1144 DWSignalHandler sh = {0};
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1145
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1146 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1147 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1148 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1149 int counter = GPOINTER_TO_INT(params[0]);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1150 GtkWidget widget = (GtkWidget )params[2];
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1151 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1152
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1153 snprintf(text, 100, "_dw_sigwindow%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1154 sh.window = (HWND)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1155 snprintf(text, 100, "_dw_sigfunc%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1156 sh.func = (void *)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1157 snprintf(text, 100, "_dw_intfunc%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1158 sh.intfunc = (void *)g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1159 snprintf(text, 100, "_dw_sigdata%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1160 sh.data = g_object_get_data(G_OBJECT(widget), text);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1161 snprintf(text, 100, "_dw_sigcid%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1162 sh.cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text));
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1163 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1164 return sh;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1165 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1166
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1167 static void _dw_remove_signal_handler(GtkWidget *widget, int counter)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1168 {
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1169 char text[101] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1170 gint cid;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1172 snprintf(text, 100, "_dw_sigcid%d", counter);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	1173 cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text));
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1174 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1175 g_signal_handler_disconnect(G_OBJECT(widget), cid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1176 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1177 snprintf(text, 100, "_dw_sigwindow%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1178 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1179 snprintf(text, 100, "_dw_sigfunc%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1180 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1181 snprintf(text, 100, "_dw_intfunc%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1182 g_object_set_data(G_OBJECT(widget), text, NULL);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1183 snprintf(text, 100, "_dw_sigdata%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1184 g_object_set_data(G_OBJECT(widget), text, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1185 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1186
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1187 static int _dw_set_signal_handler(GtkWidget widget, HWND window, void func, gpointer data, void intfunc, void discfunc)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1188 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	1189 int counter = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_sigcounter"));
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1190 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1191
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1192 snprintf(text, 100, "_dw_sigwindow%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1193 g_object_set_data(G_OBJECT(widget), text, (gpointer)window);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1194 snprintf(text, 100, "_dw_sigfunc%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1195 g_object_set_data(G_OBJECT(widget), text, (gpointer)func);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1196 snprintf(text, 100, "_dw_intfunc%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1197 g_object_set_data(G_OBJECT(widget), text, (gpointer)intfunc);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1198 snprintf(text, 100, "_dw_discfunc%d", counter);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1199 g_object_set_data(G_OBJECT(widget), text, (gpointer)discfunc);
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1200 snprintf(text, 100, "_dw_sigdata%d", counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1201 g_object_set_data(G_OBJECT(widget), text, (gpointer)data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1202
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1203 counter++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1204 g_object_set_data(G_OBJECT(widget), "_dw_sigcounter", GINT_TO_POINTER(counter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1205
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1206 return counter - 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1207 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1208
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1209 static void _dw_set_signal_handler_id(GtkWidget *widget, int counter, gint cid)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1210 {
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1211 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1212 {
2663 3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1213 char text[101] = {0};
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1214
3b3be9f7f452 GTK3/4: Add some memory safety checks that were in GTK2 but missing from GTK 3/4. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2660 diff changeset	1215 snprintf(text, 100, "_dw_sigcid%d", counter);
2660 650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1216 g_object_set_data(G_OBJECT(widget), text, GINT_TO_POINTER(cid));
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1217 }
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1218 else
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2626 diff changeset	1219 dw_debug("WARNING: Dynamic Windows failed to connect signal.\n");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1220 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1221
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1222 static void _dw_html_result_event(GObject object, GAsyncResult result, gpointer script_data)
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1223 {
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1224 #if USE_WEBKIT2
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1225 pthread_t saved_thread = _dw_thread;
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1226 WebKitJavascriptResult *js_result;
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	1227 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1228 JSCValue *value;
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	1229 #else
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1230 JSValueRef value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1231 JSGlobalContextRef context;
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	1232 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1233 GError *error = NULL;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1234 int (htmlresultfunc)(HWND, int, char , void , void ) = NULL;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1235 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(object, "_dw_html_result_id"));
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1236 void *user_data = NULL;
2030 2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1237
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1238 _dw_thread = (pthread_t)-1;
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1239 if(handlerdata)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1240 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1241 DWSignalHandler work;
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1242 void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, object };
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1243
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1244 work = _dw_get_signal_handler(params);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1245
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1246 if(work.window)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1247 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1248 htmlresultfunc = work.func;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1249 user_data = work.data;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1250 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1251 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1252
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1253 if(!(js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object), result, &error)))
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1254 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1255 if(htmlresultfunc)
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1256 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, error->message, script_data, user_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1257 g_error_free (error);
2030 2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1258 _dw_thread = saved_thread;
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1259 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1260 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1261
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1262 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1263 value = webkit_javascript_result_get_js_value(js_result);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1264 if(jsc_value_is_string(value))
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1265 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1266 gchar *str_value = jsc_value_to_string(value);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1267 JSCException *exception = jsc_context_get_exception(jsc_value_get_context(value));
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1268 #else
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1269 context = webkit_javascript_result_get_global_context(js_result);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1270 value = webkit_javascript_result_get_value(js_result);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1271 if (JSValueIsString(context, value))
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1272 {
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1273 JSStringRef js_str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1274 gchar *str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1275 gsize str_length;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1276
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1277 js_str_value = JSValueToStringCopy(context, value, NULL);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1278 str_length = JSStringGetMaximumUTF8CStringSize(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1279 str_value = (gchar *)g_malloc (str_length);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1280 JSStringGetUTF8CString(js_str_value, str_value, str_length);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1281 JSStringRelease(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1282 #endif
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1283
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1284 if(htmlresultfunc)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1285 {
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1286 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1287 if(exception)
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1288 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, (char *)jsc_exception_get_message(exception), script_data, user_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1289 else
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1290 #endif
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1291 htmlresultfunc((HWND)object, DW_ERROR_NONE, str_value, script_data, user_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1292 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1293 g_free (str_value);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1294 }
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1295 else if(htmlresultfunc)
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1296 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, NULL, script_data, user_data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1297 webkit_javascript_result_unref (js_result);
2030 2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1298 _dw_thread = saved_thread;
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1299 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1300 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1301
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1302 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1303 #ifdef USE_WEBKIT2
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1304 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1305 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1306 DWSignalHandler work = _dw_get_signal_handler(data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1307 char location = (char )webkit_web_view_get_uri(web_view);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1308 int status = 0;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1309
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1310 switch (load_event) {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1311 case WEBKIT_LOAD_STARTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1312 status = DW_HTML_CHANGE_STARTED;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1313 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1314 case WEBKIT_LOAD_REDIRECTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1315 status = DW_HTML_CHANGE_REDIRECT;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1316 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1317 case WEBKIT_LOAD_COMMITTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1318 status = DW_HTML_CHANGE_LOADING;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1319 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1320 case WEBKIT_LOAD_FINISHED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1321 status = DW_HTML_CHANGE_COMPLETE;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1322 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1323 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1324 if(status && location && work.window && work.func)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1325 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1326 int (htmlchangedfunc)(HWND, int, char , void *) = work.func;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1327
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1328 htmlchangedfunc(work.window, status, location, work.data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1329 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1330 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1331 #else
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1332 static void _dw_html_changed_event(WebKitWebView web_view, WebKitWebFrame frame, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1333 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1334 DWSignalHandler work = _dw_get_signal_handler(data);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1335 char location = (char )webkit_web_view_get_uri(web_view);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1336 int status = 0;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1337 void **params = data;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1338
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1339 if(params)
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	1340 status = DW_POINTER_TO_INT(params[3]);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1341
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1342 if(status && location && work.window && work.func)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1343 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1344 int (htmlchangedfunc)(HWND, int, char , void *) = work.func;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1345
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1346 htmlchangedfunc(work.window, status, location, work.data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1347 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1348 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1349 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1350 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1351
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1352 static gint _dw_set_focus_event(GtkWindow window, GtkWidget widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1353 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1354 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1355 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1356
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1357 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1358 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1359 int (setfocusfunc)(HWND, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1360
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1361 retval = setfocusfunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1362 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1363 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1364 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1365
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1366 static gint _dw_button_press_event(GtkWidget widget, GdkEventButton event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1367 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1368 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1369 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1370
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1371 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1372 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1373 int (buttonfunc)(HWND, int, int, int, void ) = work.func;
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1374 int mybutton = DW_BUTTON1_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1376 if(event->button == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1377 mybutton = DW_BUTTON2_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1378 else if(event->button == 2)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1379 mybutton = DW_BUTTON3_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1380
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1381 retval = buttonfunc(work.window, event->x, event->y, mybutton, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1382 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1383 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1384 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1385
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1386 static gint _dw_button_release_event(GtkWidget widget, GdkEventButton event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1387 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1388 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1389 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1390
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1391 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1392 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1393 int (buttonfunc)(HWND, int, int, int, void ) = work.func;
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1394 int mybutton = DW_BUTTON3_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1396 if(event->button == 3)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1397 mybutton = DW_BUTTON2_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1398 else if(event->button == 2)
2618 156ad91481eb WARNING: Standardize button press and release button parameter values. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2584 diff changeset	1399 mybutton = DW_BUTTON3_MASK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1400
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1401 retval = buttonfunc(work.window, event->x, event->y, mybutton, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1402 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1403 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1404 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1405
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1406 static gint _dw_motion_notify_event(GtkWidget widget, GdkEventMotion event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1407 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1408 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1409 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1410
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1411 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1413 int (motionfunc)(HWND, int, int, int, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1414 int keys = 0, x, y;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1415 GdkModifierType state = 0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1416
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1417 if (event->is_hint)
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1418 gdk_window_get_device_position (event->window, gdk_event_get_device((GdkEvent *)event), &x, &y, &state);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1419 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1420 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1421 x = event->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1422 y = event->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1423 state = event->state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1424 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1425
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1426 if (state & GDK_BUTTON1_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1427 keys = DW_BUTTON1_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1428 if (state & GDK_BUTTON3_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1429 keys \|= DW_BUTTON2_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1430 if (state & GDK_BUTTON2_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1431 keys \|= DW_BUTTON3_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1432
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1433 retval = motionfunc(work.window, x, y, keys, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1434 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1435 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1436 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1437
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1438 static gint _dw_delete_event(GtkWidget widget, GdkEvent event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1439 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1440 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1441 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1442
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1443 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1444 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1445 int (closefunc)(HWND, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1446
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1447 retval = closefunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1448 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1449 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1450 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1451
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1452 static gint _dw_key_press_event(GtkWidget widget, GdkEventKey event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1453 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1454 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1455 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1456
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1457 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1458 {
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1459 int (keypressfunc)(HWND, char, int, int, void , char *) = work.func;
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1460 guint32 unichar = gdk_keyval_to_unicode(event->keyval);
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1461 char utf8[7] = { 0 };
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1462
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1463 g_unichar_to_utf8(unichar, utf8);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1464
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1465 retval = keypressfunc(work.window, *event->string, event->keyval,
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1466 event->state & (GDK_CONTROL_MASK \| GDK_SHIFT_MASK \| GDK_MOD1_MASK), work.data, utf8);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1467 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1468 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1469 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1470
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1471 static gint _dw_generic_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1472 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1473 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1474 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1476 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1477 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1478 int (genericfunc)(HWND, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1479
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1480 retval = genericfunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1481 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1482 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1483 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1484
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1485 static gint _dw_activate_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1486 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1487 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1488 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1489
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1490 if(work.window && !_dw_ignore_click)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1491 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1492 int (activatefunc)(HWND, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1493
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	1494 retval = activatefunc(_dw_popup ? _dw_popup : work.window, work.data);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	1495 _dw_popup = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1496 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1497 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1498 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1499
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1500 static gint _dw_configure_event(GtkWidget widget, GdkEventConfigure event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1501 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1502 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1503 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1504
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1505 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1506 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1507 int (sizefunc)(HWND, int, int, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1508
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1509 retval = sizefunc(work.window, event->width, event->height, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1510 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1511 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1512 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1513
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1514 static gint _dw_expose_event(GtkWidget widget, cairo_t cr, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1515 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1516 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1517 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1518
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1519 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1520 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1521 DWExpose exp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1522 int (exposefunc)(HWND, DWExpose , void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1523
2365 77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2358 diff changeset	1524 /* Remove the currently drawn widget from the dirty list */
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2358 diff changeset	1525 _dw_dirty_list = g_list_remove(_dw_dirty_list, widget);
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2358 diff changeset	1526
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1527 exp.x = exp.y = 0;
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1528 exp.width = gtk_widget_get_allocated_width(widget);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1529 exp.height = gtk_widget_get_allocated_height(widget);
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	1530 g_object_set_data(G_OBJECT(work.window), "_dw_cr", (gpointer)cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1531 retval = exposefunc(work.window, &exp, work.data);
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	1532 g_object_set_data(G_OBJECT(work.window), "_dw_cr", NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1534 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1535 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1536
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1537 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1538 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1539 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1540 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1541
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1542 if(g_object_get_data(G_OBJECT(widget), "_dw_recursing"))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1543 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1544
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1545 if(work.window && GTK_IS_COMBO_BOX(widget))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1546 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1547 GtkTreeModel *store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1548
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1549 if(store)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1550 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1551 GtkTreeIter iter;
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1552 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1553
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1554 g_object_set_data(G_OBJECT(widget), "_dw_recursing", GINT_TO_POINTER(1));
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1555
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1556 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1557 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1558 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1559
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1560 if(path)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1561 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1562 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1563
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1564 if(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1565 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1566 int (selectfunc)(HWND, int, void ) = work.func;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1567
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1568 retval = selectfunc(work.window, indices[0], work.data);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1569 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1570 gtk_tree_path_free(path);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1571 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1572 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1573
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1574 g_object_set_data(G_OBJECT(widget), "_dw_recursing", NULL);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1575 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1576 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1577 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1579
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1580 #define _DW_DATA_TYPE_STRING 0
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1581 #define _DW_DATA_TYPE_POINTER 1
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1582
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1583 static gint _dw_tree_context_event(GtkWidget widget, GdkEventButton event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1584 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1585 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1586 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1587
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1588 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1589 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1590 if(event->button == 3)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1591 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1592 int (contextfunc)(HWND, char , int, int, void , void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1593 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1594 void *itemdata = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1595
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1596 if(widget && GTK_IS_TREE_VIEW(widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1597 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1598 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1599 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1600 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1601
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1602 if(sel && gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1603 gtk_tree_selection_get_selected(sel, NULL, &iter))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1604 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1605 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1606 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1607 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1608 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1609 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1610 {
2471 ed955edc7204 GTK3: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	1611 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1612 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1613 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1614 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1615 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1616 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1617
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1618 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1619 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1620 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1621 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1622
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1623 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1624 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1625 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1626 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1627 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1628 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1629 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1630 {
2471 ed955edc7204 GTK3: Fill in the row data for contatiner context. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2410 diff changeset	1631 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1632 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1633 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1634 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1635 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1636 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1637 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1638
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1639 retval = contextfunc(work.window, text, event->x, event->y, work.data, itemdata);
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1640 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1641 g_free(text);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1642 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1643 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1644 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1645 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1646
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1647 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1648 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1649 GtkWidget item = NULL, widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1650 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1651
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1652 if(widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1653 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1654 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1655
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1656 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1657 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1658 int (treeselectfunc)(HWND, HTREEITEM, char , void , void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1659 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1660 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1661 void *itemdata = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1662 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1663
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1664 if(g_object_get_data(G_OBJECT(widget), "_dw_double_click"))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1665 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1666 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(0));
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1667 return TRUE;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1668 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1669
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1670 if(gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1671 gtk_tree_selection_get_selected(sel, NULL, &iter))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1672 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1673 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1674 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1675 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1676 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1677 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1678 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1679 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1680 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1681 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1682 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1683 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1684 {
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1685 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1686
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1687 if(path)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1688 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1689 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1690
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1691 if(indices)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1692 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1693 int (selectfunc)(HWND, int, void ) = work.func;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1694
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1695 retval = selectfunc(work.window, indices[0], work.data);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1696 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1697 gtk_tree_path_free(path);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1698 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1699 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1700 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1701 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1702 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1703 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1704
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1705 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1706 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1707 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1708 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1709
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1710 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1711 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1712 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1713 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1714 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1715 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1716 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1717 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1718 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1719 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1720 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1721 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1722 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1723 {
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1724 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1725
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1726 if(indices)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1727 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1728 int (selectfunc)(HWND, int, void ) = work.func;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1729
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1730 retval = selectfunc(work.window, indices[0], work.data);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1731 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1732 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1733 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1734 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1735 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1736 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1737 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1738 g_free(text);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1739 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1741 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1743
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1744 static gint _dw_tree_expand_event(GtkTreeView widget, GtkTreeIter iter, GtkTreePath *path, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1745 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1746 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1747 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1748
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1749 if(!_dw_ignore_expand && work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1750 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1751 int (treeexpandfunc)(HWND, HTREEITEM, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1752 retval = treeexpandfunc(work.window, (HTREEITEM)iter, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1754 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1756
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1757 static gint _dw_container_enter_event(GtkWidget widget, GdkEventAny event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1758 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1759 DWSignalHandler work = _dw_get_signal_handler(data);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1760 GdkEventKey keyevent = (GdkEventKey )event;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1761 GdkEventButton buttonevent = (GdkEventButton )event;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1762 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1763
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1764 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1765 {
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1766 /* Handle both key and button events together */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1767 if((event->type == GDK_2BUTTON_PRESS && buttonevent->button == 1) \|\|
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1768 (event->type == GDK_KEY_PRESS && keyevent->keyval == VK_RETURN))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1769 {
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1770 int (contextfunc)(HWND, char , void , void ) = work.func;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1771 char *text = NULL;
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1772 void *data = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1773
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1774 /* Prevent some double events from happening */
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1775 if(event->type == GDK_2BUTTON_PRESS)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1776 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1777 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(1));
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1778 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1779
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1780 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1781 if(GTK_IS_TREE_VIEW(widget))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1782 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1783 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1784 GtkTreeModel store = (GtkTreeModel )gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1785
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1786 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1787 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1788 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1789 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1790
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1791 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1792 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1793 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1794 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1795 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &data, -1);
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1796 retval = contextfunc(work.window, text, work.data, data);
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1797 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1798 g_free(text);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1799 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1800 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1801 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1802 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1803 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1804 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1805 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1806 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1807 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1809 /* Return the logical page id from the physical page id */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1810 int _dw_get_logical_page(HWND handle, unsigned long pageid)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1811 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1812 int z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1813 GtkWidget **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1814 GtkWidget *thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), pageid);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1815
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1816 if(pagearray && thispage)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1817 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1818 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1819 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1820 if(thispage == pagearray[z])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1821 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1822 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1823 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1824 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1825 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1827
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1828 static gint _dw_switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, gpointer data)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1829 {
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1830 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1831 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1832
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1833 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1834 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1835 int (switchpagefunc)(HWND, unsigned long, void ) = work.func;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1836 retval = switchpagefunc(work.window, _dw_get_logical_page(GTK_WIDGET(notebook), page_num), work.data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1837 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1838 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1839 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1840
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1841 static gint _dw_column_click_event(GtkWidget *widget, gpointer data)
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1842 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1843 void **params = data;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1844 int retval = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1845
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1846 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1847 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1848 GtkWidget tree = (GtkWidget )params[2];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1849 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tree), "_dw_column_click_id"));
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1850
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1851 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1852 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1853 DWSignalHandler work;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1854
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1855 params[0] = GINT_TO_POINTER(handlerdata-1);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1856 work = _dw_get_signal_handler(params);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1857
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1858 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1859 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1860 int column_num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_column"));
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1861 int (clickcolumnfunc)(HWND, int, void ) = work.func;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1862 retval = clickcolumnfunc(work.window, column_num, work.data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1863 }
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	1864 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1865 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1866 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1867 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1868
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1869 static int _dw_round_value(gfloat val)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1870 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1871 int newval = (int)val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1872
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1873 if(val >= 0.5 + (gfloat)newval)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1874 newval++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1876 return newval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1877 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1878
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1879 static gint _dw_value_changed_event(GtkWidget *widget, gpointer data)
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1880 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1881 GtkWidget slider, spinbutton, *scrollbar;
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1882 GtkAdjustment adjustment = (GtkAdjustment )widget;
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1883 int max, val;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1884
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1885 if(!GTK_IS_ADJUSTMENT(adjustment))
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1886 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(widget), "_dw_adjustment");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1887
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1888 slider = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_slider");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1889 spinbutton = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_spinbutton");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1890 scrollbar = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_scrollbar");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1891
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1892 max = _dw_round_value(gtk_adjustment_get_upper(adjustment));
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1893 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1894
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1895 if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event"))
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1896 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1897
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1898 if (slider \|\| spinbutton \|\| scrollbar)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1899 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1900 DWSignalHandler work = _dw_get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1901
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1902 if (work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1903 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1904 int (valuechangedfunc)(HWND, int, void ) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1905
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	1906 if(slider && gtk_orientable_get_orientation(GTK_ORIENTABLE(slider)) == GTK_ORIENTATION_VERTICAL)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1907 valuechangedfunc(work.window, (max - val) - 1, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1908 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1909 valuechangedfunc(work.window, val, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1910 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1911 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1912 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1913 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1914
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1915 static gint _dw_default_key_press_event(GtkWidget widget, GdkEventKey event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1916 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1917 GtkWidget next = (GtkWidget )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1919 if(next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1920 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1921 if(event->keyval == GDK_KEY_Return)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1922 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1923 if(GTK_IS_BUTTON(next))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1924 g_signal_emit_by_name(G_OBJECT(next), "clicked");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1925 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1926 gtk_widget_grab_focus(next);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1927 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1928 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1929 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1930 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1931
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1932 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1933 static GdkPixbuf _dw_pixbuf_from_data(char data)
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1934 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1935 if(data[0] == 'G' && data[1] == 'd' && data[2] == 'k' && data[3] == 'P')
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1936 return gdk_pixbuf_new_from_inline(-1, (const guint8 *)data, FALSE, NULL);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1937 return gdk_pixbuf_new_from_xpm_data((const char **)data);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1938 }
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1939 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1940
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1941 static GdkPixbuf *_dw_pixbuf_from_resource(unsigned int rid)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1942 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1943 #if GLIB_CHECK_VERSION(2,32,0)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1944 char resource_path[201] = {0};
2205 a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	1945 snprintf(resource_path, 200, "/org/dbsoft/dwindows/resources/%u.png", rid);
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1946 return gdk_pixbuf_new_from_resource(resource_path, NULL);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1947 #else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1948 return NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1949 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1950 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1951
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	1952 static GdkPixbuf _dw_find_pixbuf(HICN icon, unsigned long userwidth, unsigned long *userheight)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1953 {
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1954 unsigned int id = GPOINTER_TO_INT(icon);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1955 GdkPixbuf *icon_pixbuf = NULL;
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1956
1289 5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1957 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1958 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1959 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1960
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1961 if(id > 65535)
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1962 icon_pixbuf = icon;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1963 else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1964 icon_pixbuf = _dw_pixbuf_from_resource(id);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1965
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1966 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1967 if(!icon_pixbuf)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1968 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1969 char *data = NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1970 int z;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1971
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1972 for(z=0;z<_resources.resource_max;z++)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1973 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1974 if(_resources.resource_id[z] == id)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1975 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1976 data = _resources.resource_data[z];
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1977 break;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1978 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1979 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1980
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1981 if(data)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1982 icon_pixbuf = _dw_pixbuf_from_data(data);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1983 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1984 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1985 if(userwidth)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1986 *userwidth = icon_pixbuf ? gdk_pixbuf_get_width(icon_pixbuf) : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1987 if(userheight)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1988 *userheight = icon_pixbuf ? gdk_pixbuf_get_height(icon_pixbuf) : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1989
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1990 return icon_pixbuf;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1991 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1992
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1993 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1994 /* Handle system notification click callbacks */
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1995 static void _dw_notification_handler(GSimpleAction action, GVariant param, gpointer user_data)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1996 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1997 char textbuf[101] = {0};
2113 aaea278c2356 GTK: Fix variant warning, needed to specify parameter type on action. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2112 diff changeset	1998 int (func)(HWND, void );
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1999 void *data;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2000
2132 42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2127 diff changeset	2001 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2002 func = g_object_get_data(G_OBJECT(_DWApp), textbuf);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2003 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
2132 42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2127 diff changeset	2004 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2005 data = g_object_get_data(G_OBJECT(_DWApp), textbuf);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2006 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2007
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2008 if(func)
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	2009 func((HWND)DW_ULONGLONG_TO_POINTER(g_variant_get_uint64(param)), data);
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2010 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2011 #endif
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2012
2197 b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2013 #if GLIB_CHECK_VERSION(2,28,0)
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2014 static void _dw_app_activate(GApplication *app, gpointer user_data)
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2015 {
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2016 /* Not sure why this signal is required, but GLib gives warnings
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2017 * when this signal is not connected, so putting this here to
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2018 * quell the warning and can be used at a later point if needed.
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2019 */
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2020 }
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2021 #endif
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2022
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2023 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
2205 a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2024 #undef dw_init
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2025 int dw_int_init(DWResources res, int newthread, int pargc, char **pargv[])
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2026 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2027 int argc = pargc ? *pargc : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2028 char *argv = pargv ? pargv : NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2029
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2030 if(res)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2031 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2032 _resources.resource_max = res->resource_max;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2033 _resources.resource_id = res->resource_id;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2034 _resources.resource_data = res->resource_data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2035 }
2205 a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2036 return dw_init(newthread, argc, argv);
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2037 }
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2038 #endif
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2039
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2040 void _dw_init_path(char *arg)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2041 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2042 char path[PATH_MAX+1] = {0};
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2043
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2044 #ifdef __linux__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2045 if(readlink("/proc/self/exe", path, PATH_MAX) == -1)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2046 #elif defined(__FreeBSD__)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2047 int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2048 size_t length = PATH_MAX;
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2049
2858 ecfbc48e933a FreeBSD: Fix the executable path detection code on FreeBSD. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2857 diff changeset	2050 if(sysctl(name, 4, path, &length, NULL, 0) == -1 \|\| length <= 1)
2859 b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	2051 #elif defined(__sun__)
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	2052 char procpath[101] = {0};
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	2053
2904 2b7babf491e1 Solaris: Fix warning because getpid() returns a long int. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2901 diff changeset	2054 snprintf(procpath, 100, "/proc/%ld/path/a.out", (long)getpid());
2859 b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	2055
b5cd3242b5e7 Solaris: Add platform specific executable path detection. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2858 diff changeset	2056 if(readlink(procpath, path, PATH_MAX) == -1)
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2057 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2058 strncpy(path, arg ? arg : "", PATH_MAX);
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2059
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2060 if(path[0])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2061 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2062 char *pos = strrchr(path, '/');
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2063 char *binname = path;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2064
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2065 /* If we have a / then...
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2066 * the binary name should be at the end.
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2067 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2068 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2069 {
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2070 binname = pos + 1;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2071 *pos = 0;
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2072 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2073
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2074 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2075 {
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2076 char *binpos = strstr(path, "/bin");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2077
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2078 if(binpos)
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2079 strncpy(_dw_share_path, path, (size_t)(binpos - path));
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2080 else
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2081 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2082 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2083 strcat(_dw_share_path, binname);
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2084 #if GLIB_CHECK_VERSION(2,28,0)
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2085 if(!_dw_app_id[0])
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2086 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2087 /* If we have a binary name, use that for the Application ID instead. */
2127 663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2118 diff changeset	2088 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.%s", DW_APP_DOMAIN_DEFAULT, binname);
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2089 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2090 #endif
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2091 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2092 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2093 /* If that failed... just get the current directory */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2094 if(!_dw_share_path[0] && !getcwd(_dw_share_path, PATH_MAX))
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2095 _dw_share_path[0] = '/';
2857 59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2096 }
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2097
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2098 /*
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2099 * Initializes the Dynamic Windows engine.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2100 * Parameters:
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2101 * newthread: True if this is the only thread.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2102 * False if there is already a message loop running.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2103 */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2104 int dw_init(int newthread, int argc, char *argv[])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2105 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2106 /* Setup the private data directory */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2855 diff changeset	2107 _dw_init_path(argc > 0 ? argv[0] : NULL);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2108
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2109 #if !GLIB_CHECK_VERSION(2,31,0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2110 g_thread_init(NULL);
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	2111 #endif
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2112
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2113 /* Load these functions via dlsym to avoid deprecation warnings */
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2114 _dw_gdk_threads_init = dlsym(RTLD_DEFAULT, "gdk_threads_init");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2115 _dw_gdk_threads_enter = dlsym(RTLD_DEFAULT, "gdk_threads_enter");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2116 _dw_gdk_threads_leave = dlsym(RTLD_DEFAULT, "gdk_threads_leave");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2117
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2118 _dw_gdk_threads_init();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2119
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2120 gtk_init(&argc, &argv);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	2122 pthread_key_create(&_dw_fg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	2123 pthread_key_create(&_dw_bg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	2124 pthread_key_create(&_dw_mutex_key, NULL);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2125
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	2126 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2127
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	2128 /* Create a global object for glib activities */
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	2129 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2130
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2131 #if GLIB_CHECK_VERSION(2,28,0)
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2132 if(!_dw_app_id[0])
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2133 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2134 /* Generate an Application ID based on the PID if all else fails. */
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	2135 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.pid.%d", DW_APP_DOMAIN_DEFAULT, (int)getpid());
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2136 }
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2137
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2138 /* Initialize the application subsystem on supported versions...
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2139 * we generate an application ID based on the binary name or PID
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2140 * instead of passing NULL to enable full application support.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2141 */
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2142 #if GLIB_CHECK_VERSION(2,74,0)
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2143 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_DEFAULT_FLAGS);
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2144 #else
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2145 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_FLAGS_NONE);
2860 9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2859 diff changeset	2146 #endif
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	2147 if(_DWApp && g_application_register(_DWApp, NULL, NULL))
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2148 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2149 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2150 /* Creat our notification handler for any notifications */
2117 37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	2151 GSimpleAction *action = g_simple_action_new("notification", G_VARIANT_TYPE_UINT64);
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2152
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2153 g_signal_connect(G_OBJECT(action), "activate", G_CALLBACK(_dw_notification_handler), NULL);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2154 g_action_map_add_action(G_ACTION_MAP(_DWApp), G_ACTION(action));
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2155 #endif
2330 58700e9fcba3 GTK3/4: Add call to g_set_prgname() with the Application ID. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2284 diff changeset	2156 g_set_prgname(_dw_app_id);
2197 b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2157 g_signal_connect(_DWApp, "activate", G_CALLBACK(_dw_app_activate), NULL);
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2158 g_application_activate(_DWApp);
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2159 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2160 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2161 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2162 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2163
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2164 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2165 * Runs a message loop for Dynamic Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2166 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2167 void API dw_main(void)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2168 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2169 _dw_gdk_threads_enter();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2170 _dw_thread = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171 gtk_main();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2172 _dw_thread = (pthread_t)-1;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2173 _dw_gdk_threads_leave();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2174 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2177 * Causes running dw_main() to return.
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2178 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2179 void API dw_main_quit(void)
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2180 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2181 gtk_main_quit();
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2182 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2183
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2184 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2187 * milliseconds: Number of milliseconds to run the loop for.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2189 void API dw_main_sleep(int milliseconds)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2190 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2191 struct timeval tv, start;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2192 pthread_t curr = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2193
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2194 gettimeofday(&start, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2195
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2196 if(_dw_thread == (pthread_t)-1 \|\| _dw_thread == curr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2197 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2198 pthread_t orig = _dw_thread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2199
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2200 gettimeofday(&tv, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2202 while(((tv.tv_sec - start.tv_sec)*1000) + ((tv.tv_usec - start.tv_usec)/1000) <= milliseconds)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2204 int _dw_locked_by_me = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2205
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 if(orig == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2207 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2208 if(!pthread_getspecific(_dw_mutex_key))
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2209 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2210 _dw_gdk_threads_enter();
2750 c77974083ba1 GTK2/3: A few more pthread_setspecific() changes... gcc 11.2 reported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2749 diff changeset	2211 pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2212 _dw_locked_by_me = TRUE;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2213 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2214 _dw_thread = curr;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2215 }
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2216 if(curr == _dw_thread && gtk_events_pending())
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2217 gtk_main_iteration();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2218 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2219 _dw_msleep(1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2220 if(orig == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2221 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2222 _dw_thread = orig;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2223 if(_dw_locked_by_me)
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2224 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2225 pthread_setspecific(_dw_mutex_key, NULL);
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2226 _dw_gdk_threads_leave();
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2227 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2228 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2229 gettimeofday(&tv, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2230 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2231 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2232 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2233 _dw_msleep(milliseconds);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2234 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2235
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2236 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2237 * Processes a single message iteration and returns.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2238 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2239 void API dw_main_iteration(void)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2240 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2241 pthread_t orig = _dw_thread;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2242 pthread_t curr = pthread_self();
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2243 int _dw_locked_by_me = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2244
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2245 if(_dw_thread == (pthread_t)-1)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2246 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2247 if(!pthread_getspecific(_dw_mutex_key))
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2248 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2249 _dw_gdk_threads_enter();
2750 c77974083ba1 GTK2/3: A few more pthread_setspecific() changes... gcc 11.2 reported the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2749 diff changeset	2250 pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2251 _dw_locked_by_me = TRUE;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2252 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2253 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2254 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2255 if(curr == _dw_thread && gtk_events_pending())
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2256 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2257 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2258 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2259 if(orig == (pthread_t)-1)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2260 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2261 _dw_thread = orig;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2262 if(_dw_locked_by_me)
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2263 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2264 pthread_setspecific(_dw_mutex_key, NULL);
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2265 _dw_gdk_threads_leave();
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2266 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2267 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2268 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2269
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2270 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2271 * Free's memory allocated by dynamic windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2272 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2273 * ptr: Pointer to dynamic windows allocated
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2274 * memory to be free()'d.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2275 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2276 void dw_free(void *ptr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2277 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2278 free(ptr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2279 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2281 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2282 * Allocates and initializes a dialog struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2283 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2284 * data: User defined data to be passed to functions.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2285 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2286 DWDialog dw_dialog_new(void data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2287 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2288 DWDialog *tmp = malloc(sizeof(DWDialog));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2289
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2290 if ( tmp )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2291 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2292 tmp->eve = dw_event_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2293 dw_event_reset(tmp->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2294 tmp->data = data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2295 tmp->done = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2296 tmp->method = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2297 tmp->result = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2298 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2299 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2300 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2302 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2303 * Accepts a dialog struct and returns the given data to the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2304 * initial called of dw_dialog_wait().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2305 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2306 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2307 * result: Data to be returned by dw_dialog_wait().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2308 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2309 int dw_dialog_dismiss(DWDialog dialog, void result)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2310 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2311 dialog->result = result;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2312 if(dialog->method)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2313 gtk_main_quit();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2314 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2315 dw_event_post(dialog->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2316 dialog->done = TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2317 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2318 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2321 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2322 * called by a signal handler with the given dialog struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2323 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2324 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326 void dw_dialog_wait(DWDialog dialog)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2327 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 void *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2329 int newprocess = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2331 if(!dialog)
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2332 return NULL;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2333
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2334 /* _dw_thread will be -1 if dw_main hasn't been run yet. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2335 if(_dw_thread == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2336 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2337 _dw_thread = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2338 newprocess = 1;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2339 _dw_gdk_threads_enter();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2340 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2341
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2342 if(pthread_self() == _dw_thread)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2343 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2344 dialog->method = TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2345 gtk_main();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2346 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2347 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2348 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2349 dialog->method = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2350 dw_event_wait(dialog->eve, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2353 if(newprocess)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2354 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2355 _dw_thread = (pthread_t)-1;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2356 _dw_gdk_threads_leave();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2357 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2358
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2359 dw_event_close(&dialog->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2360 tmp = dialog->result;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2361 free(dialog);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2362 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2363 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2365 /*
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2366 * Displays a debug message on the console...
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2367 * Parameters:
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2368 * format: printf style format string.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2369 * ...: Additional variables for use in the format.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2370 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2371 void API dw_debug(const char *format, ...)
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2372 {
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2373 va_list args;
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2374
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2375 va_start(args, format);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2376 vfprintf(stderr, format, args);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2377 va_end(args);
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2378 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2379
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2380 void API dw_vdebug(const char *format, va_list args)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2381 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2382 vfprintf(stderr, format, args);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2383 }
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2384
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2385 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2386 * Displays a Message Box with given text and title..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2387 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2388 * title: The title of the message box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2389 * flags: Defines buttons and icons to display
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2390 * format: printf style format string.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2391 * ...: Additional variables for use in the format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2392 */
2901 761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2393 int API dw_messagebox(const char title, int flags, const char format, ...)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2394 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2395 va_list args;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2396 int rc;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2397
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2398 va_start(args, format);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2399 rc = dw_vmessagebox(title, flags, format, args);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2400 va_end(args);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2401 return rc;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2402 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2403
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2860 diff changeset	2404 int dw_vmessagebox(const char title, int flags, const char format, va_list args)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2405 {
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2406 GtkMessageType gtkicon = GTK_MESSAGE_OTHER;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2407 GtkButtonsType gtkbuttons = GTK_BUTTONS_OK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2408 GtkWidget *dialog;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2409 int response, _dw_locked_by_me = FALSE;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2410 char outbuf[1025] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2411
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	2412 vsnprintf(outbuf, 1024, format, args);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	2413
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2414 if(flags & DW_MB_ERROR)
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2415 gtkicon = GTK_MESSAGE_ERROR;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2416 else if(flags & DW_MB_WARNING)
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2417 gtkicon = GTK_MESSAGE_WARNING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2418 else if(flags & DW_MB_INFORMATION)
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2419 gtkicon = GTK_MESSAGE_INFO;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2420 else if(flags & DW_MB_QUESTION)
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2421 gtkicon = GTK_MESSAGE_QUESTION;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	2422
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2423 if(flags & DW_MB_OKCANCEL)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2424 gtkbuttons = GTK_BUTTONS_OK_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2425 else if(flags & (DW_MB_YESNO \| DW_MB_YESNOCANCEL))
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2426 gtkbuttons = GTK_BUTTONS_YES_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2427
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2428 DW_MUTEX_LOCK;
2208 3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2429 dialog = gtk_message_dialog_new(NULL,
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2430 #if GTK_CHECK_VERSION(3,12,0)
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2431 GTK_DIALOG_USE_HEADER_BAR \|
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2432 #endif
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2433 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title);
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	2434 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf);
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2435 if(flags & DW_MB_YESNOCANCEL)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2436 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL);
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2437 response = gtk_dialog_run(GTK_DIALOG(dialog));
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2438 gtk_widget_destroy(dialog);
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2439 DW_MUTEX_UNLOCK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2440 switch(response)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2441 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2442 case GTK_RESPONSE_OK:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2443 return DW_MB_RETURN_OK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2444 case GTK_RESPONSE_CANCEL:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2445 return DW_MB_RETURN_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2446 case GTK_RESPONSE_YES:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2447 return DW_MB_RETURN_YES;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2448 case GTK_RESPONSE_NO:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2449 return DW_MB_RETURN_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2450 default:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2451 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2452 /* Handle the destruction of the dialog result */
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2453 if(flags & (DW_MB_OKCANCEL \| DW_MB_YESNOCANCEL))
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2454 return DW_MB_RETURN_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2455 else if(flags & DW_MB_YESNO)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2456 return DW_MB_RETURN_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2457 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2458 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2459 return DW_MB_RETURN_OK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2460 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2461
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2462 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2463 * Minimizes or Iconifies a top-level window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2464 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2465 * handle: The window handle to minimize.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2466 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2467 int dw_window_minimize(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2468 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2469 int _dw_locked_by_me = FALSE;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2470 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2471 GtkWidget *mdi = NULL;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2472 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2474 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2475 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2476
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2477 DW_MUTEX_LOCK;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2478 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2479 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2480 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2481 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_ICONIFIED);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2482 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2483 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2484 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2485 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2486 gtk_window_iconify( GTK_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2488 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2489 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2490 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2491
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2492 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2493 * Makes the window topmost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2494 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2495 * handle: The window handle to make topmost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2496 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2497 int dw_window_raise(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2498 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2499 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2500
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2501 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2502 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2504 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2505 gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(handle)));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2506 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2507 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2508 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2509
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2510 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 * Makes the window bottommost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2512 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2513 * handle: The window handle to make bottommost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2514 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2515 int dw_window_lower(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2516 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2517 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2518
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2519 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2520 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2521
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2522 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2523 gdk_window_lower(gtk_widget_get_window(GTK_WIDGET(handle)));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2524 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2526 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2527
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2528 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2529 * Makes the window visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2530 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2531 * handle: The window handle to make visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2532 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2533 int dw_window_show(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2534 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2535 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2536 GtkWidget *defaultitem;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2537 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2538 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2539 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2540
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2541 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2542 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2543
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2545 gtk_widget_show(handle);
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2546 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2547 if ((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2548 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2549 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_NORMAL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2550 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2551 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2552 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2553 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2554 GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(handle));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2555 if (window && gtk_widget_get_mapped(handle))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2556 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	2557 int width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width"));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	2558 int height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2559
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2560 /* If we had a size request before shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2561 if (width \|\| height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2562 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2563 /* Call the size function again now that we are realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2564 dw_window_set_size(handle, width, height);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2565 /* Clear out the data so we don't do it again */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2566 g_object_set_data(G_OBJECT(handle), "_dw_width", NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2567 g_object_set_data(G_OBJECT(handle), "_dw_height", NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2568 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2569
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2570 /* If we had a position request before shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2571 if (g_object_get_data(G_OBJECT(handle), "_dw_pos"))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2572 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2573 int x = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_x"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2574 int y = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_y"));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2575
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2576 /* Call the position function again now that we are realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2577 dw_window_set_pos(handle, x, y);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2578 /* Clear out the data so we don't do it again */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2579 g_object_set_data(G_OBJECT(handle), "_dw_pos", NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2580 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2581
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2582 gdk_window_raise(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2583 gdk_display_flush(gdk_display_get_default());
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2584 gdk_window_show(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2585 gdk_display_flush(gdk_display_get_default());
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2586 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2587 defaultitem = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_defaultitem");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2588 if (defaultitem)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2589 gtk_widget_grab_focus(defaultitem);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2590 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2591 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2592 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2593 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2595 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2596 * Makes the window invisible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2597 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2598 * handle: The window handle to make visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2599 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2600 int dw_window_hide(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2601 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2602 int _dw_locked_by_me = FALSE;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2603 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2604 GtkWidget *mdi = NULL;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2605 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2606
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2607 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2608 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2610 DW_MUTEX_LOCK;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2611 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2612 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2613 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2614 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_ICONIFIED);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2615 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2616 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2617 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2618 gtk_widget_hide(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2619 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2620 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2622
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2623 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2624 * Destroys a window and all of it's children.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2625 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2626 * handle: The window handle to destroy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2627 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2628 int dw_window_destroy(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2629 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2630 int _dw_locked_by_me = FALSE;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2631 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2632 GtkWidget *mdi = NULL;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2633 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2634
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2635 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2636 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2637
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2638 DW_MUTEX_LOCK;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2639 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2640 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2641 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2642 gtk_mdi_remove(GTK_MDI(mdi), handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2643 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2644 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2645 if(GTK_IS_WIDGET(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2646 {
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2647 GtkWidget box, handle2 = handle;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2648 GtkWidget eventbox = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2649
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2650 /* Handle the invisible event box if it exists */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2651 if(eventbox && GTK_IS_WIDGET(eventbox))
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2652 handle2 = eventbox;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2653
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2654 /* Check if we are removing a widget from a box */
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2655 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2656 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2657 /* Get the number of items in the box... */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2658 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2659 #if GTK_CHECK_VERSION(3,10,0)
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2660 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2661 int z;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2662
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2663 /* Figure out where in the grid this widget is and remove that row/column */
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2664 if(boxtype == DW_VERT)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2665 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2666 for(z=0;z<boxcount;z++)
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2667 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2668 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2669 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2670 gtk_grid_remove_row(GTK_GRID(box), z);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	2671 handle2 = NULL;
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2672 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2673 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2674 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2675 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2676 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2677 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2678 for(z=0;z<boxcount;z++)
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2679 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2680 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2681 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2682 gtk_grid_remove_column(GTK_GRID(box), z);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	2683 handle2 = NULL;
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2684 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2685 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2686 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2687 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2688 #endif
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2689
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2690 if(boxcount > 0)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2691 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2692 /* Decrease the count by 1 */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2693 boxcount--;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2694 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2695 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2696 }
2057 9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2697 /* Finally destroy the widget, make sure it is still
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2698 * a valid widget if it got removed from the grid.
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2699 */
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	2700 if(handle2 && GTK_IS_WIDGET(handle2))
2057 9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2701 gtk_widget_destroy(handle2);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2702 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2703 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2704 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2705 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2706
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2707 /* Causes entire window to be invalidated and redrawn.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2708 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2709 * handle: Toplevel window handle to be redrawn.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2710 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2711 void dw_window_redraw(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2712 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2713 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2714
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2715 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2716 * Changes a window's parent to newparent.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2717 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2718 * handle: The window handle to destroy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2719 * newparent: The window's new parent window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2720 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2721 void dw_window_reparent(HWND handle, HWND newparent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2722 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2723 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2724
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2725 DW_MUTEX_LOCK;
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	2726 gdk_window_reparent(gtk_widget_get_window(GTK_WIDGET(handle)), newparent ? gtk_widget_get_window(GTK_WIDGET(newparent)) : gdk_get_default_root_window(), 0, 0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2727 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2728 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2729
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2730 /*
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2731 * Sets the default font used on text based widgets.
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2732 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2733 * fontname: Font name in Dynamic Windows format.
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2734 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2735 void API dw_font_set_default(const char *fontname)
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2736 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2737 char *oldfont = _DWDefaultFont;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2738
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2739 _DWDefaultFont = strdup(fontname);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2740
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2741 if(oldfont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2742 free(oldfont);
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2743 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2744
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2745 /* Convert DW style font to CSS syntax (or Pango for older versions):
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2746 * font: font-style font-variant font-weight font-size/line-height font-family
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2747 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2748 char _dw_convert_font(const char font)
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2749 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2750 char *newfont = NULL;
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2751
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2752 if(font)
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2753 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2754 char *name = strchr(font, '.');
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2755 #if GTK_CHECK_VERSION(3,20,0)
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2756 char *Italic = strstr(font, " Italic");
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2757 char *Bold = strstr(font, " Bold");
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2758 #endif
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2759
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2760 /* Detect Dynamic Windows style font name...
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2761 * Format: ##.Fontname
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2762 * and convert to CSS or Pango syntax
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2763 */
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2764 if(name && (name++) && isdigit(*font))
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2765 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2766 int size = atoi(font);
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2767 #if GTK_CHECK_VERSION(3,20,0)
2260 cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2768 int len = (Italic ? (Bold ? (Italic > Bold ? (Bold - name) : (Italic - name)) : (Italic - name)) : (Bold ? (Bold - name) : strlen(name)));
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2769 char *newname = alloca(len+1);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2770
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2771 memset(newname, 0, len+1);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2772 strncpy(newname, name, len);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2773
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2774 newfont = g_strdup_printf("%s normal %s %dpx \"%s\"", Italic ? "italic" : "normal",
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2775 Bold ? "bold" : "normal", size, newname);
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2776 #else
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2777 newfont = g_strdup_printf("%s %d", name, size);
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2778 #endif
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2779 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2780 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2781 return newfont;
1240 3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1232 diff changeset	2782 }
3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1232 diff changeset	2783
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2784 /* Internal functions to convert to GTK3 style CSS */
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2785 static void _dw_override_color(GtkWidget widget, const char element, GdkRGBA *color)
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2786 {
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2787 gchar *dataname = g_strdup_printf ("_dw_color_%s", element);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2788 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), dataname);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2789 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2790
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2791 /* If we have an old context from a previous override remove it */
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2792 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2793 {
2243 8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2794 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2795 g_object_unref(provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2796 provider = NULL;
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2797 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2798
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2799 /* If we have a new color, create a new provider and add it */
2243 8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2800 if(color)
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2801 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2802 gchar *scolor = gdk_rgba_to_string(color);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2803 gchar css = g_strdup_printf (" { %s: %s; }", element, scolor);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2804
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2805 provider = gtk_css_provider_new();
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2806 g_free(scolor);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2807 gtk_css_provider_load_from_data(provider, css, -1, NULL);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2808 g_free(css);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2809 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2810 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2811 g_object_set_data(G_OBJECT(widget), dataname, (gpointer)provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2812 g_free(dataname);
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2813 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2814
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2815 static void _dw_override_font(GtkWidget widget, const char font)
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2816 {
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2817 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), "_dw_font");
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2818 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2819
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2820 /* If we have an old context from a previous override remove it */
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2821 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2822 {
2243 8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2823 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2824 g_object_unref(provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2825 provider = NULL;
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2826 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2827
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2828 /* If we have a new font, create a new provider and add it */
2243 8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2829 if(font)
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2830 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2831 gchar css = g_strdup_printf (" { font: %s; }", font);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2832
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2833 provider = gtk_css_provider_new();
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2834 gtk_css_provider_load_from_data(provider, css, -1, NULL);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2835 g_free(css);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2836 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2837 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2838 g_object_set_data(G_OBJECT(widget), "_dw_font", (gpointer)provider);
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2839 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2840
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2841 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2842 * Sets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2843 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2844 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2845 * fontname: Name and size of the font in the form "size.fontname"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2846 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2847 int dw_window_set_font(HWND handle, const char *fontname)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2848 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2849 GtkWidget *handle2 = handle;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	2850 char *font = _dw_convert_font(fontname);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2851 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2852 gpointer data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2854 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2855 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2856 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2857 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2858 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2859 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2860 }
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2861 /* If it is a groupox we want to operate on the frame label */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2862 else if(GTK_IS_FRAME(handle))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2863 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2864 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2865 if(tmp)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2866 handle2 = tmp;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2867 }
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2868 else if(GTK_IS_COMBO_BOX(handle) \|\| GTK_IS_BUTTON(handle))
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2869 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2870 GtkWidget *tmp = gtk_bin_get_child(GTK_BIN(handle));
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2871 if(tmp)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2872 handle2 = tmp;
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2873 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2874
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2875 /* Free old font name if one is allocated */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2876 data = g_object_get_data(G_OBJECT(handle2), "_dw_fontname");
1240 3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1232 diff changeset	2877 g_object_set_data(G_OBJECT(handle2), "_dw_fontname", (gpointer)font);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2878 if(data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2879 free(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2880
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2881 _dw_override_font(handle2, font);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2882
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2884 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2885 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2886
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2887 /* Allows the user to choose a font using the system's font chooser dialog.
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2888 * Parameters:
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2889 * currfont: current font
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2890 * Returns:
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2891 * A malloced buffer with the selected font or NULL on error.
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2892 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2893 char * API dw_font_choose(const char *currfont)
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2894 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2895 GtkFontChooser *fd;
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2896 char *font = currfont ? strdup(currfont) : NULL;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2897 char *name = font ? strchr(font, '.') : NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2898 int _dw_locked_by_me = FALSE;
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2899 char *retfont = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2900
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2901 /* Detect Dynamic Windows style font name...
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2902 * Format: ##.Fontname
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2903 * and convert to a Pango name
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2904 */
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2905 if(name && isdigit(*font))
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2906 {
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2907 int size = atoi(font);
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2908 *name = 0;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2909 name++;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2910 sprintf(font, "%s %d", name, size);
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2911 }
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2912
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2913 DW_MUTEX_LOCK;
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2914 fd = (GtkFontChooser *)gtk_font_chooser_dialog_new("Choose font", NULL);
1057 0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1054 diff changeset	2915 if(font)
0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1054 diff changeset	2916 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2917 gtk_font_chooser_set_font(fd, font);
1057 0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1054 diff changeset	2918 free(font);
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2919 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2920
1053 0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1052 diff changeset	2921 gtk_widget_show(GTK_WIDGET(fd));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2922
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2923 if(gtk_dialog_run(GTK_DIALOG(fd)) == GTK_RESPONSE_OK)
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2924 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2925 char *fontname = gtk_font_chooser_get_font(fd);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2926 if(fontname && (retfont = strdup(fontname)))
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2927 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2928 int len = strlen(fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2929 /* Convert to Dynamic Windows format if we can... */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2930 if(len > 0 && isdigit(fontname[len-1]))
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2931 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2932 int size, x=len-1;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2933
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2934 while(x > 0 && fontname[x] != ' ')
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2935 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2936 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2937 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2938 size = atoi(&fontname[x]);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2939 /* If we were able to find a valid size... */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2940 if(size > 0)
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2941 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2942 /* Null terminate after the name...
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2943 * and create the Dynamic Windows style font.
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2944 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2945 fontname[x] = 0;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2946 snprintf(retfont, len+1, "%d.%s", size, fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2947 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2948 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2949 g_free(fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2950 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2951 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2952 gtk_widget_destroy(GTK_WIDGET(fd));
1052 c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2953 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2954 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2955 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2956
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2957 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2958 * Gets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2960 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2961 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2962 char *dw_window_get_font(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2963 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2964 PangoFontDescription *pfont;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2965 PangoContext *pcontext;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2966 GtkWidget *handle2 = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2967 char *font;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2968 char *retfont=NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	2969 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2970
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2971 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2972 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2973 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2974 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2975 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2976 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2977 }
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2978 /* If it is a groupox we want to operate on the frame label */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2979 else if(GTK_IS_FRAME(handle))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2980 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2981 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2982 if(tmp)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2983 handle2 = tmp;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2984 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2986 pcontext = gtk_widget_get_pango_context( handle2 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2987 if ( pcontext )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2988 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2989 pfont = pango_context_get_font_description( pcontext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2990 if ( pfont )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2991 {
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2992 int len, x;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2993
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2994 font = pango_font_description_to_string( pfont );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2995 retfont = strdup(font);
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2996 len = strlen(font);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2997 /* Convert to Dynamic Windows format if we can... */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2998 if(len > 0 && isdigit(font[len-1]))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2999 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3000 int size;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	3001
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3002 x=len-1;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3003 while(x > 0 && font[x] != ' ')
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3004 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3005 x--;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3006 }
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3007 size = atoi(&font[x]);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3008 /* If we were able to find a valid size... */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3009 if(size > 0)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3010 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3011 /* Null terminate after the name...
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3012 * and create the Dynamic Windows style font.
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3013 */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3014 font[x] = 0;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3015 snprintf(retfont, len+1, "%d.%s", size, font);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3016 }
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3017 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3018 g_free( font );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3019 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3021 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3022 return retfont;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3023 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3024
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3025 void _dw_free_gdk_colors(HWND handle)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3026 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3027 GdkRGBA old = (GdkRGBA )g_object_get_data(G_OBJECT(handle), "_dw_foregdk");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3028
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3029 if(old)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3030 free(old);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3031
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3032 old = (GdkRGBA *)g_object_get_data(G_OBJECT(handle), "_dw_backgdk");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3034 if(old)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3035 free(old);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3036 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3037
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3038 /* Free old color pointers and allocate new ones */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3039 static void _dw_save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back)
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3040 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3041 GdkRGBA *foregdk = malloc(sizeof(GdkRGBA));
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3042 GdkRGBA *backgdk = malloc(sizeof(GdkRGBA));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3043
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3044 _dw_free_gdk_colors(handle);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3045
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3046 *foregdk = fore;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3047 *backgdk = back;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3048
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3049 g_object_set_data(G_OBJECT(handle), "_dw_foregdk", (gpointer)foregdk);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3050 g_object_set_data(G_OBJECT(handle), "_dw_backgdk", (gpointer)backgdk);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3051 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3052
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3053 static int _dw_set_color(HWND handle, unsigned long fore, unsigned long back)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3054 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3055 /* Remember that each color component in X11 use 16 bit no matter
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3056 * what the destination display supports. (and thus GDK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3057 */
1847 ff80ad40a5d6 Initial attempt at allowing DW_CLR_DEFAULT clear color style overrides on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1832 diff changeset	3058 GdkRGBA forecolor = {0}, backcolor = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3060 if(fore & DW_RGB_COLOR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3061 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3062 forecolor.alpha = 1.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3063 forecolor.red = (gdouble)DW_RED_VALUE(fore) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3064 forecolor.green = (gdouble)DW_GREEN_VALUE(fore) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3065 forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3066 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3067 else if(fore != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3068 forecolor = _dw_colors[fore];
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3069
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	3070 _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3071
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3072 if(back & DW_RGB_COLOR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3073 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3074 backcolor.alpha = 1.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3075 backcolor.red = (gdouble)DW_RED_VALUE(back) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3076 backcolor.green = (gdouble)DW_GREEN_VALUE(back) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3077 backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3078 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3079 else if(back != DW_CLR_DEFAULT)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3080 backcolor = _dw_colors[back];
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3081
1916 eafaab13d0db Minor fix to that last commit, and remove call to gtk_tree_view_set_rules_hint() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1915 diff changeset	3082 _dw_override_color(handle, "background-color", back != DW_CLR_DEFAULT ? &backcolor : NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3083
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3084 _dw_save_gdk_colors(handle, forecolor, backcolor);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3085
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3086 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3087 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3088 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3089 * Sets the colors used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3090 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3091 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3092 * fore: Foreground color in RGB format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3093 * back: Background color in RGB format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3094 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3095 int dw_window_set_color(HWND handle, unsigned long fore, unsigned long back)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3096 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3097 GtkWidget *handle2 = handle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3098 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3099
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3100 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3101
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3102 if(GTK_IS_SCROLLED_WINDOW(handle) \|\| GTK_IS_BOX(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3103 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3104 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3105 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3106 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3107 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3108 else if(GTK_IS_GRID(handle))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3109 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3110 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3111 if(tmp)
1637 c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1634 diff changeset	3112 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3113 handle2 = tmp;
1637 c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1634 diff changeset	3114 fore = DW_CLR_DEFAULT;
c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1634 diff changeset	3115 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3116 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3117
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3118 _dw_set_color(handle2, fore, back);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3119
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3120 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3121 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3122 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3123
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3124 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3125 * Sets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3126 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3127 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3128 * border: Size of the window border in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3129 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3130 int dw_window_set_border(HWND handle, int border)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3131 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3132 /* TODO */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3133 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3134 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3135
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3136 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3137 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3138 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3139 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3140 #endif
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3141
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3142 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3143 * Captures the mouse input to this window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3144 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3145 * handle: Handle to receive mouse input.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3146 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3147 void dw_window_capture(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3148 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3149 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3150
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3151 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3152 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3153 _dw_grab_seat = gdk_display_get_default_seat(gtk_widget_get_display(handle));
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3154 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3155 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3156 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3157 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3158 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3159 _dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle));
2208 3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	3160 gdk_device_grab(gdk_device_manager_get_client_pointer(_dw_grab_manager),
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3161 gtk_widget_get_window(handle),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3162 GDK_OWNERSHIP_WINDOW,
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3163 FALSE,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3164 GDK_BUTTON_RELEASE_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3165 NULL,
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3166 GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3167 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3168 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3169 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3170
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3171 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3172 * Changes the appearance of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3173 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3174 * handle: Handle to widget for which to change.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3175 * cursortype: ID of the pointer you want.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3176 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3177 void dw_window_set_pointer(HWND handle, int pointertype)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3178 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3179 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3180 GdkCursor *cursor;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3181
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3182 DW_MUTEX_LOCK;
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	3183 if(pointertype > 65535)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	3184 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3185 GdkPixbuf *pixbuf = _dw_find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3186 cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 8, 8);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3187 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3188 else if(!pointertype)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3189 cursor = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3190 else
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	3191 cursor = gdk_cursor_new_for_display(gdk_display_get_default(), pointertype);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3192 if(handle && gtk_widget_get_window(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3193 gdk_window_set_cursor(gtk_widget_get_window(handle), cursor);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3194 if(cursor)
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3195 g_object_unref(cursor);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3196 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3197 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3198
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3199 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3200 * Releases previous mouse capture.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3201 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3202 void dw_window_release(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3203 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3204 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3205
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3206 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3207 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3208 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3209 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3210 _dw_grab_seat = NULL;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3211 #else
2208 3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	3212 gdk_device_ungrab(gdk_device_manager_get_client_pointer(_dw_grab_manager), GDK_CURRENT_TIME);
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	3213 _dw_grab_manager = NULL;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3214 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3215 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3216 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3217
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3218 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3219 * Create a new Window Frame.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3220 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3221 * owner: The Owner's window handle or HWND_DESKTOP.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3222 * title: The Window title.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3223 * flStyle: Style flags, see the PM reference.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3224 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3225 HWND dw_window_new(HWND hwndOwner, const char *title, unsigned long flStyle)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3226 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3227 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3228 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3229 int flags = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3230
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3231 DW_MUTEX_LOCK;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3232 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3233 if(hwndOwner && GTK_IS_MDI(hwndOwner))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3234 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3235 GtkWidget *label;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3236
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3237 tmp = dw_box_new(DW_VERT, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3238
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3239 label = gtk_label_new(title);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3240 gtk_widget_show(label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3241 g_object_set_data(G_OBJECT(tmp), "_dw_mdi_child", GINT_TO_POINTER(1));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3242 g_object_set_data(G_OBJECT(tmp), "_dw_mdi_title", (gpointer)label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3243 g_object_set_data(G_OBJECT(tmp), "_dw_mdi", (gpointer)hwndOwner);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3245 gtk_mdi_put(GTK_MDI(hwndOwner), tmp, 100, 75, label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3246 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3247 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3248 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3249 {
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3250 GtkWidget *box = dw_box_new(DW_VERT, 0);
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3251 GtkWidget *grid = gtk_grid_new();
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3252
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3253 gtk_widget_show_all(grid);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3254
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3255 tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3256
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3257 gtk_window_set_title(GTK_WINDOW(tmp), title);
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	3258 gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3259
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3260 gtk_widget_realize(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3261
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3262 if(flStyle & DW_FCF_TITLEBAR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3263 flags \|= GDK_DECOR_TITLE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3265 if(flStyle & DW_FCF_MINMAX)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3266 flags \|= GDK_DECOR_MINIMIZE \| GDK_DECOR_MAXIMIZE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3267
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3268 if(flStyle & DW_FCF_SIZEBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3269 flags \|= GDK_DECOR_RESIZEH \| GDK_DECOR_BORDER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3270
1491 d77b8cf25f04 Code cleanup and removed some erroneous code for GTK in dw_window_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1486 diff changeset	3271 if(flStyle & (DW_FCF_BORDER \| DW_FCF_DLGBORDER))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 flags \|= GDK_DECOR_BORDER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3273
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3274 if(flStyle & DW_FCF_FULLSCREEN)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3275 gtk_window_fullscreen(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3276 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3277 {
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3278 if(flStyle & DW_FCF_MAXIMIZE)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3279 gtk_window_maximize(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3280
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3281 if(flStyle & DW_FCF_MINIMIZE)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3282 gtk_window_iconify(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3283 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3284
1388 8fe15c1648c9 Fix windows on GTK that aren't supposed to have a close button.. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1386 diff changeset	3285 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */
1491 d77b8cf25f04 Code cleanup and removed some erroneous code for GTK in dw_window_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1486 diff changeset	3286 gtk_window_set_deletable(GTK_WINDOW(tmp), (flStyle & (DW_FCF_CLOSEBUTTON \| DW_FCF_SYSMENU)) ? TRUE : FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3288 gdk_window_set_decorations(gtk_widget_get_window(tmp), flags);
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	3289 if(!flags)
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	3290 gtk_window_set_decorated(GTK_WINDOW(tmp), FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3291
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3292 if(hwndOwner)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3293 gdk_window_reparent(gtk_widget_get_window(GTK_WIDGET(tmp)), gtk_widget_get_window(GTK_WIDGET(hwndOwner)), 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3295 if(flStyle & DW_FCF_SIZEBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3296 g_object_set_data(G_OBJECT(tmp), "_dw_size", GINT_TO_POINTER(1));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3297
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3298 gtk_grid_attach(GTK_GRID(grid), box, 0, 1, 1, 1);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3299 gtk_container_add(GTK_CONTAINER(tmp), grid);
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3300 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3301 g_object_set_data(G_OBJECT(tmp), "_dw_grid", (gpointer)grid);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	3302 gtk_widget_add_events(GTK_WIDGET(tmp), GDK_PROPERTY_CHANGE_MASK);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3303 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304 g_object_set_data(G_OBJECT(tmp), "_dw_style", GINT_TO_POINTER(flStyle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3305 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3306 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3307 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3308
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3310 * Create a new Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3311 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3312 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3313 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3314 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3315 HWND dw_box_new(int type, int pad)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3316 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3317 GtkWidget tmp, eventbox;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3318 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3320 DW_MUTEX_LOCK;
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3321 tmp = gtk_grid_new();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3322 eventbox = gtk_event_box_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3323
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3324 gtk_widget_show(eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3325 g_object_set_data(G_OBJECT(tmp), "_dw_eventbox", (gpointer)eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3326 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3327 g_object_set_data(G_OBJECT(tmp), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3328 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3329 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3330 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3331 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3332
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3333 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3334 * Create a new scrollable Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3335 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3336 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3337 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3338 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3339 HWND dw_scrollbox_new( int type, int pad )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3340 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3341 GtkWidget tmp, box, *eventbox;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3342 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3343
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3344 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3345 tmp = gtk_scrolled_window_new(NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3346 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3347
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3348 box = gtk_grid_new();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3349 eventbox = gtk_event_box_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3350
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3351 gtk_widget_show(eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3352 g_object_set_data(G_OBJECT(box), "_dw_eventbox", (gpointer)eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3353 g_object_set_data(G_OBJECT(box), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3354 g_object_set_data(G_OBJECT(box), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3355 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3356
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3357 #if GTK_CHECK_VERSION(3,8,0)
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3358 gtk_container_add(GTK_CONTAINER(tmp), box);
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3359 #else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3360 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tmp),box);
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3361 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3362 g_object_set_data(G_OBJECT(tmp), "_dw_user", box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3363 gtk_widget_show(box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3364 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3365
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3366 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3367 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3368 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3371 * Returns the position of the scrollbar in the scrollbox
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3372 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3373 * handle: Handle to the scrollbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3374 * orient: The vertical or horizontal scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3375 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376 int dw_scrollbox_get_pos(HWND handle, int orient)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3377 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3378 int val = -1, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3379 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3380
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3381 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3382 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3383
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3384 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3385 if ( orient == DW_HORZ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3386 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3387 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3388 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3389 if (adjustment)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3390 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3391 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3392 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3393 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3394
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3395 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3396 * Gets the range for the scrollbar in the scrollbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3397 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3398 * handle: Handle to the scrollbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3399 * orient: The vertical or horizontal scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3400 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3401 int API dw_scrollbox_get_range(HWND handle, int orient)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3402 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3403 int range = -1, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3404 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3407 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3408
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3409 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3410 if ( orient == DW_HORZ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3411 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3412 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3413 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3414 if (adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3415 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3416 range = _dw_round_value(gtk_adjustment_get_upper(adjustment));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3417 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3418 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3419 return range;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3421
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3422 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3423 * Create a new Group Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3424 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3425 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3426 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3427 * title: Text to be displayined in the group outline.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3428 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3429 HWND dw_groupbox_new(int type, int pad, const char *title)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3430 {
1038 2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	3431 GtkWidget tmp, frame;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3432 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3433
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3434 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3435 frame = gtk_frame_new(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3436 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3437 gtk_frame_set_label(GTK_FRAME(frame), title && *title ? title : NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3438
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3439 tmp = gtk_grid_new();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3440 gtk_container_set_border_width(GTK_CONTAINER(tmp), pad);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3441 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3442 g_object_set_data(G_OBJECT(tmp), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3443 g_object_set_data(G_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3444 gtk_container_add(GTK_CONTAINER(frame), tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3445 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3446 gtk_widget_show(frame);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3447 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3448 dw_window_set_font(frame, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3449 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450 return frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3451 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3453 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3455 * Create a new MDI Frame to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3456 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3457 * id: An ID to be used with dw_window_from_id or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3458 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3459 HWND dw_mdi_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3460 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3462 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3463
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465 tmp = gtk_mdi_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3466 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3467 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3468 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3470 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3471
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473 * Create a bitmap object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3474 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3475 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3476 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 HWND dw_bitmap_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3478 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3479 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3480 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3481
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3482 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3483 tmp = gtk_image_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3484 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3485 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3487 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3488 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3490 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 * Create a notebook object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3492 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3495 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3496 HWND dw_notebook_new(unsigned long id, int top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3497 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3498 GtkWidget tmp, pagearray = calloc(sizeof(GtkWidget ), 256);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3499 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3500
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3502 tmp = gtk_notebook_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503 if(top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3504 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_TOP);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3505 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3506 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_BOTTOM);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3507 gtk_notebook_set_scrollable(GTK_NOTEBOOK(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3509 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3510 g_object_set_data(G_OBJECT(tmp), "_dw_pagearray", (gpointer)pagearray);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3511 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3515 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3516 * Create a menu object to be popped up.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3517 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3518 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3519 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 HMENUI dw_menu_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3522 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3523 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3524 GtkAccelGroup *accel_group;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3525 HMENUI tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3526
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3527 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3528 tmp = gtk_menu_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3529 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3530 accel_group = gtk_accel_group_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3531 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3532 g_object_set_data(G_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3533 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3534 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3535 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3536
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3537 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3538 * Create a menubar on a window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3539 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3540 * location: Handle of a window frame to be attached to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3541 * If there is no box already packed into the "location", the menu will not appear
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3542 * so tell the user.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3543 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 HMENUI dw_menubar_new(HWND location)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3545 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3546 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3547 GtkAccelGroup *accel_group;
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3548 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3549 HMENUI tmp = 0;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3550
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3551 DW_MUTEX_LOCK;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3552 if(GTK_IS_WINDOW(location) &&
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3553 (box = (GtkWidget *)g_object_get_data(G_OBJECT(location), "_dw_grid")))
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3554 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3555 /* If there is an existing menu bar, remove it */
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3556 GtkWidget oldmenu = (GtkWidget )g_object_get_data(G_OBJECT(location), "_dw_menubar");
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3557 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3558 gtk_widget_destroy(oldmenu);
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3559 /* Create a new menu bar */
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3560 tmp = gtk_menu_bar_new();
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3561 gtk_widget_show(tmp);
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3562 accel_group = gtk_accel_group_new();
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3563 g_object_set_data(G_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3564 /* Save pointers to each other */
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3565 g_object_set_data(G_OBJECT(location), "_dw_menubar", (gpointer)tmp);
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3566 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)location);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3567 gtk_grid_attach(GTK_GRID(box), tmp, 0, 0, 1, 1);
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3568 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3569 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3570 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3571 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 * Destroys a menu created with dw_menubar_new or dw_menu_new.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3575 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3576 * menu: Handle of a menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3577 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3578 void dw_menu_destroy(HMENUI *menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580 if(menu && *menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3581 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3582 int _dw_locked_by_me = FALSE;
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3583 GtkWidget *window;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3584
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3585 DW_MUTEX_LOCK;
1452 dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3586 /* If it is a menu bar, try to delete the reference to it */
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3587 if(GTK_IS_MENU_BAR(*menu) &&
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3588 (window = (GtkWidget )g_object_get_data(G_OBJECT(menu), "_dw_window")))
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3589 g_object_set_data(G_OBJECT(window), "_dw_menubar", NULL);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1451 diff changeset	3590 /* Actually destroy the menu */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3591 gtk_widget_destroy(*menu);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3592 *menu = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3593 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3594 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3595 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3596
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3597 char _dw_removetilde(char dest, const char src)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3598 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3599 int z, cur=0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3600 char accel = '\0';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3601
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3602 for(z=0;z<strlen(src);z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3603 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3604 if(src[z] != '~')
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3605 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3606 dest[cur] = src[z];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3607 cur++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3608 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3609 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3610 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3611 dest[cur] = '_';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3612 accel = src[z+1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3613 cur++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3614 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3615 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3616 dest[cur] = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3617 return accel;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3618 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3619
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3620 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3621 * Adds a menuitem or submenu to an existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3622 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3623 * menu: The handle to the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3624 * title: The title text on the menu item to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3625 * id: An ID to be used for message passing.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3626 * flags: Extended attributes to set on the menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3627 * end: If TRUE memu is positioned at the end of the menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3628 * check: If TRUE menu is "check"able.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3629 * submenu: Handle to an existing menu to be a submenu or NULL.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3630 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3631 HWND dw_menu_append_item(HMENUI menu, const char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI submenu)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3632 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3633 GtkWidget *tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3634 char accel, *tempbuf = malloc(strlen(title)+1);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3635 int _dw_locked_by_me = FALSE, submenucount;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3636 GtkAccelGroup *accel_group;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3637
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3638 if (!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3639 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3640 free(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3641 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3642 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3643
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3644 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3645 accel = _dw_removetilde(tempbuf, title);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3646
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3647 accel_group = (GtkAccelGroup *)g_object_get_data(G_OBJECT(menu), "_dw_accel");
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	3648 submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_submenucount"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3649
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650 if (strlen(tempbuf) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3651 tmphandle=gtk_menu_item_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3652 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3653 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3654 char numbuf[25] = {0};
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3655
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3656 if (check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3657 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3658 tmphandle = gtk_check_menu_item_new_with_label(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3659 if (accel && accel_group)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3660 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3661 gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmphandle))), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3662 #if 0 /* TODO: This isn't working right */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3663 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3664 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3665 }
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3666 snprintf(numbuf, 24, "%lu", id);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3667 g_object_set_data(G_OBJECT(menu), numbuf, (gpointer)tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3668 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3669 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3671 tmphandle=gtk_menu_item_new_with_label(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3672 if (accel && accel_group)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3673 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3674 gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmphandle))), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3675 #if 0 /* TODO: This isn't working right */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3676 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3677 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 }
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3679 snprintf(numbuf, 24, "%lu", id);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 g_object_set_data(G_OBJECT(menu), numbuf, (gpointer)tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3681 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3682 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3684 gtk_widget_show(tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3686 if (submenu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3687 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3688 char tempbuf[101] = {0};
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3689
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3690 snprintf(tempbuf, 100, "_dw_submenu%d", submenucount);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3691 submenucount++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3692 gtk_menu_item_set_submenu(GTK_MENU_ITEM(tmphandle), submenu);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3693 g_object_set_data(G_OBJECT(menu), tempbuf, (gpointer)submenu);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	3694 g_object_set_data(G_OBJECT(menu), "_dw_submenucount", GINT_TO_POINTER(submenucount));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3695 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3696
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3697 if (GTK_IS_MENU_BAR(menu))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3698 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3699 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3700 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3701
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3702 g_object_set_data(G_OBJECT(tmphandle), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3703 free(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3704 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3705 * Set flags
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3706 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3707 if ( check && (flags & DW_MIS_CHECKED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3708 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3709 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3710 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3711 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3712 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3714 if ( flags & DW_MIS_DISABLED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3715 gtk_widget_set_sensitive( tmphandle, FALSE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3716
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3717 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3718 return tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3719 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3720
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3721 GtkWidget _dw_find_submenu_id(GtkWidget start, const char *name)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3722 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3723 GtkWidget *tmp;
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	3724 int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3725
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3726 if((tmp = g_object_get_data(G_OBJECT(start), name)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3727 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3728
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3729 for(z=0;z<submenucount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3730 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3731 char tempbuf[101] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3732 GtkWidget submenu, menuitem;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3733
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	3734 snprintf(tempbuf, 100, "_dw_submenu%d", z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3735
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3736 if((submenu = g_object_get_data(G_OBJECT(start), tempbuf)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3737 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3738 if((menuitem = _dw_find_submenu_id(submenu, name)))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3739 return menuitem;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3742 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3744
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3745 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3746 * Sets the state of a menu item check.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3747 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3748 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3749 * id: Menuitem id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3750 * check: TRUE for checked FALSE for not checked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3751 * deprecated: use dw_menu_item_set_state()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3752 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3753 void dw_menu_item_set_check(HMENUI menu, unsigned long id, int check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3754 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3755 char numbuf[25] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 GtkWidget *tmphandle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3757 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3758
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3759 if(!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3760 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3761
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3762 DW_MUTEX_LOCK;
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3763 snprintf(numbuf, 24, "%lu", id);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3764 tmphandle = _dw_find_submenu_id(menu, numbuf);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3765
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3766 if(tmphandle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3767 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3768 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3769 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(tmphandle)) != check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3770 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), check);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3771 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3772 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3774 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3776 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3777 * Sets the state of a menu item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3778 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3779 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3780 * id: Menuitem id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 * state: TRUE for checked FALSE for not checked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 void dw_menu_item_set_state(HMENUI menu, unsigned long id, unsigned long state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3784 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3785 char numbuf[25] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3786 GtkWidget *tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787 int check;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3788 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3789
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 if(!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3791 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3793 DW_MUTEX_LOCK;
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3794 snprintf(numbuf, 24, "%lu", id);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3795 tmphandle = _dw_find_submenu_id(menu, numbuf);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3796
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 if ( (state & DW_MIS_CHECKED) \|\| (state & DW_MIS_UNCHECKED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3799 if ( state & DW_MIS_CHECKED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 check = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3801 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 check = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3804 if (tmphandle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3805 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3806 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3807 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(tmphandle)) != check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3808 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), check);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3809 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3810 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3811 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3812 if ( (state & DW_MIS_ENABLED) \|\| (state & DW_MIS_DISABLED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3813 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3814 if (tmphandle )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3815 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3816 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817 if ( state & DW_MIS_ENABLED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3818 gtk_widget_set_sensitive( tmphandle, TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3819 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3820 gtk_widget_set_sensitive( tmphandle, FALSE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3821 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3822 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3827 /*
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3828 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3829 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3830 * menu: The handle to the menu in which the item was appended.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3831 * id: Menuitem id.
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3832 * Returns:
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3833 * DW_ERROR_NONE (0) on success or DW_ERROR_UNKNOWN on failure.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3834 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3835 int API dw_menu_delete_item(HMENUI menu, unsigned long id)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3836 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3837 char numbuf[25] = {0};
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3838 GtkWidget *tmphandle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3839 int _dw_locked_by_me = FALSE;
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3840 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3841
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3842 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3843 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3844
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3845 DW_MUTEX_LOCK;
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	3846 snprintf(numbuf, 24, "%lu", id);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3847 tmphandle = _dw_find_submenu_id(menu, numbuf);
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3848
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3849 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3850 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3851 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3852 g_object_set_data(G_OBJECT(menu), numbuf, NULL);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3853 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3854 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3855 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3856 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3857 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3858
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3859 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3860 * Pops up a context menu at given x and y coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3861 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3862 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3863 * parent: Handle to the window initiating the popup.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3864 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3865 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3866 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3867 void dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3868 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3869 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3870
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871 if(!menu \|\| !*menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3873
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3874 _dw_popup = parent;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3877 #if GTK_CHECK_VERSION(3,22,0)
1931 3a5571255ee6 GTK3: dw_menu_popup() on GTK has always ignored the coordinate paramaters bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1930 diff changeset	3878 gtk_menu_popup_at_pointer(GTK_MENU(*menu), NULL);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3879 #else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3880 gtk_menu_popup(GTK_MENU(*menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3881 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3882 *menu = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3887 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3888 * Returns the current X and Y coordinates of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3889 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3890 * x: Pointer to variable to store X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 * y: Pointer to variable to store Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3892 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3893 void dw_pointer_query_pos(long x, long y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3894 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3895 int gx = 0, gy = 0;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3896 #ifdef GDK_WINDOWING_X11
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3897 GdkModifierType state = 0;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3898 int _dw_locked_by_me = FALSE;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3899 GdkDisplay *display;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3900
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3901 DW_MUTEX_LOCK;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3902 display = gdk_display_get_default();
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3903
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3904 if(display && GDK_IS_X11_DISPLAY(display))
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3905 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3906 #if GTK_CHECK_VERSION(3,20,0)
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3907 GdkSeat *seat = gdk_display_get_default_seat(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3908 GdkDevice *device = gdk_seat_get_pointer(seat);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3909 #else
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3910 GdkDeviceManager *manager = gdk_display_get_device_manager(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3911 GdkDevice *device = gdk_device_manager_get_client_pointer(manager);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3912 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3913 gdk_window_get_device_position(gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3914 device, &gx, &gy, &state);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3915 }
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3916 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3917 #endif
1122 e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1121 diff changeset	3918 if(x)
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1121 diff changeset	3919 *x = gx;
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1121 diff changeset	3920 if(y)
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1121 diff changeset	3921 *y = gy;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3922 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3923
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3924 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3925 * Sets the X and Y coordinates of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3928 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3930 void dw_pointer_set_pos(long x, long y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 {
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3932 #ifdef GDK_WINDOWING_X11
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3933 int _dw_locked_by_me = FALSE;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3934 GdkDisplay *display;
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3935
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3936 DW_MUTEX_LOCK;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3937 display = gdk_display_get_default();
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3938
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3939 if(display && GDK_IS_X11_DISPLAY(display))
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3940 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3941 #if GTK_CHECK_VERSION(3,20,0)
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3942 GdkSeat *seat = gdk_display_get_default_seat(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3943 GdkDevice *device = gdk_seat_get_pointer(seat);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3944 #else
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3945 GdkDeviceManager *manager = gdk_display_get_device_manager(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3946 GdkDevice *device = gdk_device_manager_get_client_pointer(manager);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3947 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3948 gdk_device_warp(device, gdk_screen_get_default(), x, y);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3949 }
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3950 DW_MUTEX_UNLOCK;
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3951 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3953
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3954 #define _DW_TREE_CONTAINER 1
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3955 #define _DW_TREE_TREE 2
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3956 #define _DW_TREE_LISTBOX 3
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3957
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3958 GtkWidget *_dw_tree_create(unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3959 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3961
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 tmp = gtk_scrolled_window_new(NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3963 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3967 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3969 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3970
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3971 GtkWidget _dw_tree_setup(GtkWidget tmp, GtkTreeModel *store)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3972 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 GtkWidget *tree = gtk_tree_view_new_with_model(store);
900 2ba1f71e23fa Disable searching in GTK tree view based controls. It is very disconcerting. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 892 diff changeset	3974 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3975 #if GTK_CHECK_VERSION(3,8,0)
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3976 gtk_container_add(GTK_CONTAINER(tmp), tree);
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3977 #else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3978 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tmp), tree);
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3979 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3980 g_object_set_data(G_OBJECT(tmp), "_dw_user", (gpointer)tree);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3981 return tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3982 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3983
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3984 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985 * Create a container object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3986 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3987 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3988 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3989 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3990 HWND dw_container_new(unsigned long id, int multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3992 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	3993 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3994
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3995 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	3996 if(!(tmp = _dw_tree_create(id)))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3997 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3998 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3999 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4000 }
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4001 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4002 g_object_set_data(G_OBJECT(tmp), "_dw_multi_sel", GINT_TO_POINTER(multi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4003 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4004 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4007 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4008 * Create a tree object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4009 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4010 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4011 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4012 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4013 HWND dw_tree_new(ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4014 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 GtkWidget tmp, tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4016 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4017 GtkTreeViewColumn *col;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4018 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019 GtkTreeSelection *sel;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4020 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4022 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4023 if(!(tmp = _dw_tree_create(id)))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4024 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4026 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4028 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4029 tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store));
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4030 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4031 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4032 col = gtk_tree_view_column_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4034 rend = gtk_cell_renderer_pixbuf_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4035 gtk_tree_view_column_pack_start(col, rend, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4036 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4038 gtk_tree_view_column_pack_start(col, rend, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4039 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4040
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4041 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4042 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4043 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4045 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4047 gtk_widget_show(tree);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4048
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4049 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4050 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4051 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4052 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4053 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4054
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 * Create a new static text window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4058 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4059 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4060 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4061 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4062 HWND dw_text_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4063 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4064 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4065 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4067 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4068 tmp = gtk_label_new(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4069
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4070 /* Left and centered */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	4071 #if GTK_CHECK_VERSION(3,16,0)
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	4072 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	4073 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4074 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4075 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f);
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4076 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4077 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4078 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4079 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4080 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4081 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4082 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4083 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4084
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4085 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4086 * Create a new status text window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4087 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4088 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4089 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4090 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4091 HWND dw_status_text_new(const char *text, ULONG id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4092 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4093 GtkWidget tmp, frame;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4094 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4096 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4097 frame = gtk_frame_new(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4098 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4099 tmp = gtk_label_new(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4100 gtk_container_add(GTK_CONTAINER(frame), tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4101 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4102 gtk_widget_show(frame);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4103
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4104 /* Left and centered */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	4105 #if GTK_CHECK_VERSION(3,16,0)
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	4106 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	4107 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4108 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4109 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f);
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4110 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4111 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4112 g_object_set_data(G_OBJECT(frame), "_dw_label", (gpointer)tmp);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4113 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4114 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4115 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4116 return frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4117 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4118
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4119 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 * Create a new Multiline Editbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4121 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4122 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4123 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124 HWND dw_mle_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4125 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	4126 GtkWidget tmp, tmpbox;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4127 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4129 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4130 tmpbox = gtk_scrolled_window_new (NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4131 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tmpbox),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4133 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tmpbox), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134 tmp = gtk_text_view_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4135 gtk_container_add (GTK_CONTAINER(tmpbox), tmp);
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	4136 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4138 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4139 g_object_set_data(G_OBJECT(tmpbox), "_dw_user", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4140 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4141 gtk_widget_show(tmpbox);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4142 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4143 dw_window_set_font(tmpbox, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4144 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4145 return tmpbox;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4148 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149 * Create a new Entryfield window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4150 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4151 * text: The default text to be in the entryfield widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4152 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4154 HWND dw_entryfield_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4155 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4156 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4157 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4159 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4160 tmp = gtk_entry_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4161
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4162 gtk_entry_set_text(GTK_ENTRY(tmp), text);
1352 08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1330 diff changeset	4163 gtk_entry_set_width_chars(GTK_ENTRY(tmp), 0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4166 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4168 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4169 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4171 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4174 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175 * Create a new Entryfield (password) window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4176 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4177 * text: The default text to be in the entryfield widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4178 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4179 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4180 HWND dw_entryfield_password_new(const char *text, ULONG id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4181 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4182 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4183 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4184
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4185 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4186 tmp = gtk_entry_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4187
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4188 gtk_entry_set_visibility(GTK_ENTRY(tmp), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4189 gtk_entry_set_text(GTK_ENTRY(tmp), text);
1352 08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1330 diff changeset	4190 gtk_entry_set_width_chars(GTK_ENTRY(tmp), 0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4192 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4193 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4194
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4195 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4196 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4197 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4201 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4202 * Create a new Combobox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4204 * text: The default text to be in the combpbox widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4207 HWND dw_combobox_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4210 GtkListStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4211 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4212
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4214 store = gtk_list_store_new(1, G_TYPE_STRING);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store));
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4216 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	4217 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), text);
1352 08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1330 diff changeset	4218 gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), 0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4219 gtk_widget_show(tmp);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4220 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4222 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4223 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4224 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4225 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4226 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4228 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 * Create a new button window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4230 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4231 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4232 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4233 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4234 HWND dw_button_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4235 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4236 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4237 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4238
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4239 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4240 tmp = gtk_button_new_with_label(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4241 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4242 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4243 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4244 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4245 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4246 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4247 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4248
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4249 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4250 * Create a new bitmap button window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4252 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4253 * id: An ID of a bitmap in the resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4254 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4255 HWND dw_bitmapbutton_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4256 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4258 GtkWidget *bitmap;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4259 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4261 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4262 tmp = gtk_button_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4263 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4265 if(bitmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4266 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 dw_window_set_bitmap(bitmap, id, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4268 gtk_container_add (GTK_CONTAINER(tmp), bitmap);
1069 a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1066 diff changeset	4269 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4271 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4273 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4274 gtk_widget_set_tooltip_text(tmp, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4275 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4276 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4277 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4278 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 * Create a new bitmap button window (widget) to be packed from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4283 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 * label_text: Text to display on button. TBD when Windows works
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4286 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4287 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4288 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4289 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4290 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4291 HWND dw_bitmapbutton_new_from_file(const char text, unsigned long id, const char filename)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4292 {
1830 6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4293 GtkWidget *tmp;
1831 ce7543633fef Slight typo in that last commit fixed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1830 diff changeset	4294 GtkWidget *bitmap;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4295 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4297 DW_MUTEX_LOCK;
1069 a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1066 diff changeset	4298 /* Create a new button */
1830 6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4299 tmp = gtk_button_new();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4300 /* Now on to the image stuff */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4301 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 if(bitmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303 {
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4304 dw_window_set_bitmap(bitmap, 0, filename);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4305 gtk_container_add(GTK_CONTAINER(tmp), bitmap);
1830 6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4306 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4307 }
1832 cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1831 diff changeset	4308 gtk_widget_show(tmp);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4309 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4310 {
1830 6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4311 gtk_widget_set_tooltip_text(tmp, text);
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4312 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4313 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4314 DW_MUTEX_UNLOCK;
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4315 return tmp;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4316 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4317
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4319 * Create a new bitmap button window (widget) to be packed from data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4320 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4321 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4322 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4323 * data: Raw data of image.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 * len: Length of raw data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4327 HWND dw_bitmapbutton_new_from_data(const char text, unsigned long id, const char data, int len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4328 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330 GtkWidget *bitmap;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4331 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4333 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 tmp = gtk_button_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4335 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4336
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4337 if(bitmap)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4338 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339 dw_window_set_bitmap_from_data(bitmap, 0, data, len);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4340 gtk_container_add(GTK_CONTAINER(tmp), bitmap);
1069 a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1066 diff changeset	4341 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4342 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4344 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4345 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4346 gtk_widget_set_tooltip_text(tmp, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4347 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4348 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4349 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4350 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4354 * Create a new spinbutton window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4356 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4357 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4358 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4359 HWND dw_spinbutton_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4360 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4361 GtkAdjustment *adj;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4362 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4363 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365 DW_MUTEX_LOCK;
1022 fa1a826348b3 Change the default range of spinbuttons to be -65536 to 65536 on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1021 diff changeset	4366 adj = (GtkAdjustment *)gtk_adjustment_new ((float)atoi(text), -65536.0, 65536.0, 1.0, 5.0, 0.0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4367 tmp = gtk_spin_button_new (adj, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4368 gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4369 gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4371 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4372 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4373 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4374 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4375 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4377 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4378 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4380 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4381 * Create a new radiobutton window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4382 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4383 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4384 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4385 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4386 HWND dw_radiobutton_new(const char *text, ULONG id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4387 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4388 /* This will have to be fixed in the future. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4389 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4390 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4391
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4392 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4393 tmp = gtk_radio_button_new_with_label(NULL, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4394 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4395 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4397 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4398 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4399 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4400 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4401 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4402
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4403 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4404 * Create a new slider window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4405 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406 * vertical: TRUE or FALSE if slider is vertical.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4407 * increments: Number of increments available.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4408 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4409 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4410 HWND dw_slider_new(int vertical, int increments, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4411 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4413 GtkAdjustment *adjustment;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4414 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4415
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4416 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4417 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1);
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	4418 tmp = gtk_scale_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 gtk_scale_set_draw_value(GTK_SCALE(tmp), 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 gtk_scale_set_digits(GTK_SCALE(tmp), 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4423 g_object_set_data(G_OBJECT(adjustment), "_dw_slider", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4424 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4425 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4427 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4428
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4429 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4430 gboolean ubuntu_overlay_scrollbar_get_enabled(void);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4431 void ubuntu_overlay_scrollbar_set_enabled(gboolean enabled);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4432 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4433
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4434 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4435 * Create a new scrollbar window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4436 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4437 * vertical: TRUE or FALSE if scrollbar is vertical.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4438 * increments: Number of increments available.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4439 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 HWND dw_scrollbar_new(int vertical, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4442 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4443 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4444 GtkAdjustment *adjustment;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4445 int _dw_locked_by_me = FALSE;
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4446 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4447 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4448 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4449
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4450 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4451 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4452 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4453 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4454 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1);
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	4456 tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4457 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4458 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4459 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4460 gtk_widget_set_can_focus(tmp, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4461 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4462 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4463 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4464 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4465 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4466 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4467 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4468
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4470 * Create a new percent bar window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4472 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4473 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 HWND dw_percent_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4476 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4477 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4478
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4479 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4480 tmp = gtk_progress_bar_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4481 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4482 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4483 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4484 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4485 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4487 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4488 * Create a new checkbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4489 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4491 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4492 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4493 HWND dw_checkbox_new(const char *text, unsigned long id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4494 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4495 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4496 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4497
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4498 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4499 tmp = gtk_check_button_new_with_label(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4500 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4501 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4502 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4503 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4504 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4505 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4506 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4507
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4508 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4509 * Create a new listbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4511 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 * multi: Multiple select TRUE or FALSE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4513 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4514 HWND dw_listbox_new(unsigned long id, int multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 GtkWidget tmp, tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4517 GtkListStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4518 GtkTreeViewColumn *col;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4519 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4520 GtkTreeSelection *sel;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4521 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4523 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4524 if(!(tmp = _dw_tree_create(id)))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4525 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4526 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4527 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4528 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4529 store = gtk_list_store_new(1, G_TYPE_STRING);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4530 tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store));
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4531 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4532 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4533
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4534 col = gtk_tree_view_column_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4535 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4536 gtk_tree_view_column_pack_start(col, rend, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4537 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4538
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4539 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4542
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4544 if(multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4545 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4546 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4547 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4548 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4550 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4551 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4552 gtk_widget_show(tree);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4553 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4554 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4555 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4557 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4559 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4560 * Sets the icon used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4561 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4563 * id: An ID to be used to specify the icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4564 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 void dw_window_set_icon(HWND handle, HICN icon)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4566 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4567 GdkPixbuf *icon_pixbuf;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4568 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4569
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4570 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4571 icon_pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573 if(gtk_widget_get_window(handle) && icon_pixbuf)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4574 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4575 GList *list = g_list_append(NULL, icon_pixbuf);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4576 gdk_window_set_icon_list(gtk_widget_get_window(handle), list);
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4577 g_list_free(list);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4579 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4580 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4582 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4583 * Sets the bitmap used for a given static window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4584 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4585 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4586 * id: An ID to be used to specify the icon,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4587 * (pass 0 if you use the filename param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4588 * filename: a path to a file (Bitmap on OS/2 or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4589 * Windows and a pixmap on Unix, pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590 * NULL if you use the id param)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4591 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4592 * DW_ERROR_NONE on success.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4593 * DW_ERROR_UNKNOWN if the parameters were invalid.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4594 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4595 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4596 int dw_window_set_bitmap(HWND handle, unsigned long id, const char *filename)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4597 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4598 GdkPixbuf *tmp = NULL;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4599 int i, found_ext = 0;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4600 int _dw_locked_by_me = FALSE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4601 int retval = DW_ERROR_UNKNOWN;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4602
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4603 if(!id && !filename)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4604 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4605
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4606 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4607 if(id)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4608 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4609 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4610 {
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	4611 char *file = alloca(strlen(filename) + 6);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4612
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4613 if(!file)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4614 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4615 DW_MUTEX_UNLOCK;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4616 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4617 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4618
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4619 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4620
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4621 /* check if we can read from this file (it exists and read permission) */
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4622 if(access(file, 04) != 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4623 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4624 /* Try with various extentions */
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4625 for(i = 0; i < NUM_EXTS; i++)
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4626 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4627 strcpy(file, filename);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4628 strcat(file, _dw_image_exts[i]);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4629 if(access( file, 04 ) == 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4630 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4631 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4632 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4633 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4634 }
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4635 if(found_ext == 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4636 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4637 DW_MUTEX_UNLOCK;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4638 return DW_ERROR_GENERAL;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4639 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4640 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4641 tmp = gdk_pixbuf_new_from_file(file, NULL);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4642 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4643
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4644 if(tmp)
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4645 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4646 if(GTK_IS_BUTTON(handle))
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4647 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4648 GtkWidget pixmap = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4649 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4650 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4651 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4652 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4653 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4654 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4655 else if(GTK_IS_IMAGE(handle))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4656 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4657 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4658 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4659 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4660 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4661 DW_MUTEX_UNLOCK;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4662 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4663 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4664
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4665 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4666 * Sets the bitmap used for a given static window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4667 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4668 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4669 * id: An ID to be used to specify the icon,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4670 * (pass 0 if you use the filename param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4671 * data: the image data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4672 * Bitmap on Windows and a pixmap on Unix, pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4673 * NULL if you use the id param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4674 * len: length of data
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4675 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4676 * DW_ERROR_NONE on success.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4677 * DW_ERROR_UNKNOWN if the parameters were invalid.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4678 * DW_ERROR_GENERAL if the bitmap was unable to be loaded.
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4679 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4680 int dw_window_set_bitmap_from_data(HWND handle, unsigned long id, const char *data, int len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4681 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4682 GdkPixbuf *tmp = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4683 int _dw_locked_by_me = FALSE;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4684 int retval = DW_ERROR_UNKNOWN;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4685
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4686 if(!id && !data)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4687 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4688
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4689 DW_MUTEX_LOCK;
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4690 if(data)
fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4691 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4692 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4693 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4694 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695 */
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4696 char template[] = "/tmp/dwpixmapXXXXXX";
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4697 int written = -1, fd = mkstemp(template);
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4698
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4699 if(fd != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4700 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4701 written = write(fd, data, len);
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4702 close(fd);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4704 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4705 if(fd == -1 \|\| written != len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4706 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4707 DW_MUTEX_UNLOCK;
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4708 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4709 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4710
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4711 tmp = gdk_pixbuf_new_from_file(template, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4712 /* remove our temporary file */
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4713 unlink(template);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4714 }
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4715 else if (id)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	4716 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4717
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4718 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4719 {
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4720 if(GTK_IS_BUTTON(handle))
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4721 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4722 GtkWidget pixmap = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4723
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4724 if(pixmap)
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4725 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4726 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4727 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4728 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4729 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4730 else if(GTK_IS_IMAGE(handle))
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4731 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4732 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), tmp);
2854 8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4733 retval = DW_ERROR_NONE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4734 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4735 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4736 DW_MUTEX_UNLOCK;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2751 diff changeset	4737 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4740 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4741 * Sets the text used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4742 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4743 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4744 * text: The text associated with a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4745 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4746 void dw_window_set_text(HWND handle, const char *text)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4747 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4748 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4749 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4750
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4751 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4752 if((tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi_title")))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 handle = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 if(GTK_IS_ENTRY(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 gtk_entry_set_text(GTK_ENTRY(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4756 else if(GTK_IS_COMBO_BOX(handle))
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	4757 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))), text);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4758 else if(GTK_IS_LABEL(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4759 gtk_label_set_text(GTK_LABEL(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4760 else if(GTK_IS_BUTTON(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4761 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4762 gtk_button_set_label(GTK_BUTTON(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4763 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4764 else if(gtk_widget_is_toplevel(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4765 gtk_window_set_title(GTK_WINDOW(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4766 else if (GTK_IS_FRAME(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4767 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4768 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4769 * This is a groupbox or status_text
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4770 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4771 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_label");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4772 if ( tmp && GTK_IS_LABEL(tmp) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4773 gtk_label_set_text(GTK_LABEL(tmp), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4774 else /* assume groupbox */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4775 gtk_frame_set_label(GTK_FRAME(handle), text && *text ? text : NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4776 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4777 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4778 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4779
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4780 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4781 * Sets the text used for a given window's floating bubble help.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4782 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4783 * handle: Handle to the window (widget).
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4784 * bubbletext: The text in the floating bubble tooltip.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4785 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4786 void API dw_window_set_tooltip(HWND handle, const char *bubbletext)
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4787 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4788 int _dw_locked_by_me = FALSE;
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4789
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4790 DW_MUTEX_LOCK;
1400 ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1390 diff changeset	4791 if(bubbletext && *bubbletext)
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1390 diff changeset	4792 gtk_widget_set_tooltip_text(handle, bubbletext);
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1390 diff changeset	4793 else
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1390 diff changeset	4794 gtk_widget_set_has_tooltip(handle, FALSE);
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4795 DW_MUTEX_UNLOCK;
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4796 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4797
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4798 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 * Gets the text used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4800 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4801 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4802 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4803 * text: The text associsated with a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4804 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 char *dw_window_get_text(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4806 {
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4807 const char *possible = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4808 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4809
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4810 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4811 if(GTK_IS_ENTRY(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4812 possible = gtk_entry_get_text(GTK_ENTRY(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4813 else if(GTK_IS_COMBO_BOX(handle))
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	4814 possible = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	4815 else if(GTK_IS_LABEL(handle))
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	4816 possible = gtk_label_get_text(GTK_LABEL(handle));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818 DW_MUTEX_UNLOCK;
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4819 return strdup(possible ? possible : "");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4820 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4821
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4823 * Disables given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4824 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4825 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4826 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4827 void dw_window_disable(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4828 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4829 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4830
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4831 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4832 gtk_widget_set_sensitive(handle, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4833 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4834 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4837 * Enables given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4838 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4839 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4840 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4841 void dw_window_enable(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4842 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4843 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4845 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4846 gtk_widget_set_sensitive(handle, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4847 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4848 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4850 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 * Gets the child window handle with specified ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4852 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4853 * handle: Handle to the parent window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4854 * id: Integer ID of the child.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4855 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4856 HWND API dw_window_from_id(HWND handle, int id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4857 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4858 GList orig = NULL, list = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4859 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4861 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4862 if(handle && GTK_IS_CONTAINER(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4863 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4864 orig = list = gtk_container_get_children(GTK_CONTAINER(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4865 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4866 while(list)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4867 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4868 if(GTK_IS_WIDGET(list->data))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4869 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	4870 if(id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data), "_dw_id")))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4871 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4872 HWND ret = (HWND)list->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4873 g_list_free(orig);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4874 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4875 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4876 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4877 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4878 list = list->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4879 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4880 if(orig)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4881 g_list_free(orig);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4882 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4883 return 0L;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4884 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4885
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 * Adds text to an MLE box and returns the current point.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4888 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4889 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 * buffer: Text buffer to be imported.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4891 * startpoint: Point to start entering text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4893 unsigned int dw_mle_import(HWND handle, const char *buffer, int startpoint)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4894 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4895 unsigned int tmppoint = startpoint;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4896 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4897
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4898 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4900 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4902
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4903 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4907
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4909 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4910 gtk_text_buffer_place_cursor(tbuffer, &iter);
994 f1c7b03f944d Removed carriage return stripping from GTK3, it is not needed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	4911 gtk_text_buffer_insert_at_cursor(tbuffer, buffer, -1);
f1c7b03f944d Removed carriage return stripping from GTK3, it is not needed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 986 diff changeset	4912 tmppoint = (startpoint > -1 ? startpoint : 0) + strlen(buffer);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4916 return tmppoint;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4917 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4919 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4920 * Grabs text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4921 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4922 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 * buffer: Text buffer to be exported. MUST allow for trailing nul character.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 * startpoint: Point to start grabbing text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925 * length: Amount of text to be grabbed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4927 void dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4928 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4929 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4930 gchar *text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4931
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4932 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4933 /* force the return value to nul in case the following tests fail */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4934 if(buffer)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4935 buffer[0] = '\0';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4936 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4937 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4939
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4940 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4941 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4943 GtkTextIter start, end;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4946 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4947 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4948 text = gtk_text_iter_get_text(&start, &end);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4949 if(text) /* Should this get freed? */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4950 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4951 if(buffer)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4952 strcpy(buffer, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4954 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4955 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4956 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4958
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4960 * Obtains information about an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4961 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4962 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4963 * bytes: A pointer to a variable to return the total bytes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4964 * lines: A pointer to a variable to return the number of lines.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4965 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4966 void dw_mle_get_size(HWND handle, unsigned long bytes, unsigned long lines)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4967 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	4968 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4969
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 if(bytes)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971 *bytes = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 if(lines)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4973 *lines = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4975 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4976 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4978 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4981 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4983
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 if(bytes)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4985 *bytes = gtk_text_buffer_get_char_count(buffer);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986 if(lines)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4987 *lines = gtk_text_buffer_get_line_count(buffer);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4989 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4990 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4991 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4992
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4993 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4994 * Deletes text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4995 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4996 * handle: Handle to the MLE to be deleted from.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4997 * startpoint: Point to start deleting text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4998 * length: Amount of text to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4999 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 void dw_mle_delete(HWND handle, int startpoint, int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5001 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5002 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5003
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5004 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5005 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5006 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5007 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5010 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5011 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5012 GtkTextIter start, end;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5013
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5017 gtk_text_buffer_delete(tbuffer, &start, &end);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5019 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5021 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 * Clears all text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 * handle: Handle to the MLE to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028 void dw_mle_clear(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5029 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5030 int length, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5031
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5032 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5033 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5034 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5036
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5037 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5038 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5039 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5040
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5041 length = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5042 gtk_text_buffer_set_text(buffer, "", length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5043 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5044 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5048 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5049 * Sets the visible line of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5050 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5051 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5052 * line: Line to be visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5053 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 void dw_mle_set_visible(HWND handle, int line)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5055 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5056 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5057
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5058 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5059 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5060 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5061 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5062
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5064 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5065 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 GtkTextMark mark = (GtkTextMark )g_object_get_data(G_OBJECT(handle), "_dw_mark");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5071 gtk_text_iter_set_line(&iter, line);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5072 if(!mark)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5073 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5075 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5076 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5077 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5080 0, FALSE, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5082 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5083 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5084 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5087 * Sets the editablity of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5089 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5090 * state: TRUE if it can be edited, FALSE for readonly.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5091 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5092 void dw_mle_set_editable(HWND handle, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5093 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5094 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5100
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5101 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5102 gtk_text_view_set_editable(GTK_TEXT_VIEW(tmp), state);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5103 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5105 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5107 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5108 * Sets the word wrap state of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5109 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5111 * state: TRUE if it wraps, FALSE if it doesn't.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5113 void dw_mle_set_word_wrap(HWND handle, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5114 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5115 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5116
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5117 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5120 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 if(tmp && GTK_IS_TEXT_VIEW(tmp))
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	5123 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5126 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5128 /*
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5129 * Sets the word auto complete state of an MLE box.
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5130 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5131 * handle: Handle to the MLE.
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5132 * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5133 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5134 void dw_mle_set_auto_complete(HWND handle, int state)
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5135 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5136 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5137
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5138 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5139 * Sets the current cursor position of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5140 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141 * handle: Handle to the MLE to be positioned.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5142 * point: Point to position cursor.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5143 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144 void dw_mle_set_cursor(HWND handle, int point)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5146 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5147
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5149 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5150 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5151 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5154 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5155 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5156 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5157 GtkTextMark mark = (GtkTextMark )g_object_get_data(G_OBJECT(handle), "_dw_mark");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5159 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5161 if(!mark)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5162 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5164 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5165 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5167 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5168 gtk_text_buffer_place_cursor(tbuffer, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5169 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5170 0, FALSE, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5171 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5174 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5175
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5176 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177 * Finds text in an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5178 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5179 * handle: Handle to the MLE to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5180 * text: Text to search for.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5181 * point: Start point of search.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5182 * flags: Search specific flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5183 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5184 int dw_mle_search(HWND handle, const char *text, int point, unsigned long flags)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5186 int _dw_locked_by_me = FALSE, retval = 0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5187
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5189 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5191 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5192
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5195 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5196 GtkTextIter iter, found;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5197
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5198 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5199 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5200 gtk_text_iter_forward_search(&iter, text, GTK_TEXT_SEARCH_TEXT_ONLY, &found, NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5201 retval = gtk_text_iter_get_offset(&found);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5202 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5204 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5206 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5209 * Stops redrawing of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5210 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5211 * handle: Handle to the MLE to freeze.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5212 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5213 void dw_mle_freeze(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5214 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5215 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5216
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5217 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5218 * Resumes redrawing of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5219 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5220 * handle: Handle to the MLE to thaw.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5221 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 void dw_mle_thaw(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5223 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5224 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5225
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5226 /* Internal function to update the progress bar
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	5227 * while in an indeterminate state.
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5228 */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5229 gboolean _dw_update_progress_bar(gpointer data)
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5230 {
1191 40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5231 if(g_object_get_data(G_OBJECT(data), "_dw_alive"))
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5232 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5233 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(data));
1191 40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5234 return TRUE;
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5235 }
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1190 diff changeset	5236 return FALSE;
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5237 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5238
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5239 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5240 * Sets the percent bar position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5241 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5242 * handle: Handle to the percent bar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5243 * position: Position of the percent bar withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5244 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5245 void dw_percent_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5246 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5247 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5248
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5249 DW_MUTEX_LOCK;
1190 76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5250 if(position == DW_PERCENT_INDETERMINATE)
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5251 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5252 /* Check if we are indeterminate already */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5253 if(!g_object_get_data(G_OBJECT(handle), "_dw_alive"))
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5254 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5255 /* If not become indeterminate... and start a timer to continue */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5256 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(handle));
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5257 g_object_set_data(G_OBJECT(handle), "_dw_alive", GINT_TO_POINTER(1));
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5258 g_timeout_add(100, (GSourceFunc)_dw_update_progress_bar, (gpointer)handle);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5259 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5260 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5261 else
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5262 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5263 /* Cancel the existing timer if one is there */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5264 g_object_set_data(G_OBJECT(handle), "_dw_alive", NULL);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5265 /* Set the position like normal */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5266 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(handle), (gfloat)position/100);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1185 diff changeset	5267 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5268 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5269 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5270
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5271 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5272 * Returns the position of the slider.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5273 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5274 * handle: Handle to the slider to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5275 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5276 unsigned int dw_slider_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5277 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5278 int val = 0, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5279 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5281 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5282 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5285 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5286 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5287 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5288 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5289 int thisval = _dw_round_value(gtk_adjustment_get_value(adjustment));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5290
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5291 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5292 val = max - thisval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5294 val = thisval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5295 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5298 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5301 * Sets the slider position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5302 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5303 * handle: Handle to the slider to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5304 * position: Position of the slider withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5305 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5306 void dw_slider_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5307 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5308 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5309 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5310
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5311 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5312 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5313
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5315 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5316 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5317 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5318 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5319
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5320 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321 gtk_adjustment_set_value(adjustment, (gfloat)(max - position));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5322 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5323 gtk_adjustment_set_value(adjustment, (gfloat)position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5324 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5325 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5326 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 * Returns the position of the scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5330 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5331 * handle: Handle to the scrollbar to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5332 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5333 unsigned int dw_scrollbar_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5334 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5335 int val = 0, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5336 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5337
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5338 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5339 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5340
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343 if(adjustment)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5344 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5345 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5346 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5347 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5349 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5350 * Sets the scrollbar position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5352 * handle: Handle to the scrollbar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5353 * position: Position of the scrollbar withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5354 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5355 void dw_scrollbar_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5356 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5357 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5358 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5360 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5361 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5362
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5364 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5365 if(adjustment)
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5366 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5367 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(1));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5368 gtk_adjustment_set_value(adjustment, (gfloat)position);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5369 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(0));
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5370 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5371 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5372 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5373
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5374 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5375 * Sets the scrollbar range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5376 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5377 * handle: Handle to the scrollbar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5378 * range: Maximum range value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5379 * visible: Visible area relative to the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5380 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5381 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5382 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5383 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5384 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5386 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5387 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5388
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5390 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5391 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5393 gtk_adjustment_set_upper(adjustment, (gdouble)range);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5394 gtk_adjustment_set_page_increment(adjustment,(gdouble)visible);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5395 gtk_adjustment_set_page_size(adjustment, (gdouble)visible);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5396 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5397 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5398 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5399
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5400 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5401 * Sets the spinbutton value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5402 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5403 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5405 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406 void dw_spinbutton_set_pos(HWND handle, long position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5407 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5408 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 gtk_spin_button_set_value(GTK_SPIN_BUTTON(handle), (gfloat)position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5412 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5413 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5415 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5416 * Sets the spinbutton limits.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5417 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5418 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5419 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5420 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5421 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5422 void dw_spinbutton_set_limits(HWND handle, long upper, long lower)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5423 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5424 long curval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5425 GtkAdjustment *adj;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5426 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5427
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5428 curval = dw_spinbutton_get_pos(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5429 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 adj = (GtkAdjustment *)gtk_adjustment_new((gfloat)curval, (gfloat)lower, (gfloat)upper, 1.0, 5.0, 0.0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5431 gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(handle), adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5433 * Set our internal relationships between the adjustment and the spinbutton
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 g_object_set_data(G_OBJECT(handle), "_dw_adjustment", (gpointer)adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5436 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5437 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5438 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5439
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 * Sets the entryfield character limit.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5442 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5443 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5444 * limit: Number of characters the entryfield will take.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5445 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5446 void dw_entryfield_set_limit(HWND handle, ULONG limit)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5448 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5449
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5450 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5451 gtk_entry_set_max_length(GTK_ENTRY(handle), limit);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5452 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5453 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5454
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5455 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5456 * Returns the current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5457 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 * handle: Handle to the spinbutton to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5459 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5460 long dw_spinbutton_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5462 long retval;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5463 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5464
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5465 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5466 retval = (long)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5467 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5469 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5470 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5471
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5472 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473 * Returns the state of the checkbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5474 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 * handle: Handle to the checkbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5476 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5477 int dw_checkbox_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5478 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479 int retval;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5480 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5481
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5482 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5483 retval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5484 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5485
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5486 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5490 * Sets the state of the checkbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5491 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5492 * handle: Handle to the checkbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5493 * value: TRUE for checked, FALSE for unchecked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5495 void dw_checkbox_set(HWND handle, int value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5496 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5497 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5499 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5500 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(handle), value);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5501 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5502 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5505 * Inserts an item into a tree window (widget) after another item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5506 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 * handle: Handle to the tree to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5508 * item: Handle to the item to be positioned after.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5509 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5510 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5511 * parent: Parent handle or 0 if root.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5512 * itemdata: Item specific data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5513 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5514 HTREEITEM dw_tree_insert_after(HWND handle, HTREEITEM item, const char title, HICN icon, HTREEITEM parent, void itemdata)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5515 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5516 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5517 GtkTreeIter *iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5518 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5519 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5520 HTREEITEM retval = 0;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5521 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5522
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5523 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5524 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5525
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5527 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5528 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5529 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5530 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5531 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5532
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5533 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5535 gtk_tree_store_insert_after(store, iter, (GtkTreeIter )parent, (GtkTreeIter )item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5536 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5537 retval = (HTREEITEM)iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5538 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5539 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5540
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5541 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5544 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5545 * Inserts an item into a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5546 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5547 * handle: Handle to the tree to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5548 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5549 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 * parent: Parent handle or 0 if root.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 * itemdata: Item specific data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5553 HTREEITEM dw_tree_insert(HWND handle, const char title, HICN icon, HTREEITEM parent, void itemdata)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5554 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5556 GtkTreeIter *iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5558 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5559 HTREEITEM retval = 0;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5560 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5561
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5562 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5564
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5565 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5566 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5567 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5568 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5569 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5570 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5571
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5572 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5573
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5574 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 retval = (HTREEITEM)iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5577 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5580 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584 * Sets the text and icon of an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5587 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5588 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5589 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5591 void dw_tree_item_change(HWND handle, HTREEITEM item, const char *title, HICN icon)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5592 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5594 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 GdkPixbuf *pixbuf;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5596 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5599 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5604 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5605 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5606 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5607
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5608 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5609 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5610 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5611 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614 * Sets the item data of a tree item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5615 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5617 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5618 * itemdata: User defined data to be associated with item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620 void dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5621 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5624 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626 if(!handle \|\| !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 gtk_tree_store_set(store, (GtkTreeIter *)item, 2, itemdata, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5634 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5637 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5638 * Gets the text an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5639 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5640 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5641 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5643 char * API dw_tree_get_title(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5645 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5646 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5647 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5648 GtkTreeModel *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5649
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5650 if(!handle \|\| !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5651 return text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5652
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 if(tree && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5658 gtk_tree_model_get(store, (GtkTreeIter *)item, _DW_DATA_TYPE_STRING, &text, -1);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5659 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5660 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5661 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5662 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5663 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5664 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5665 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5666 return text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5667 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5670 * Gets the text an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5671 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5672 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5674 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5675 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5676 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5677 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5678 HTREEITEM parent = (HTREEITEM)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5679 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5680 GtkTreeModel *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 if(!handle \|\| !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5683 return parent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5684
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5685 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5686 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5688 if(tree && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5689 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5690 {
1900 969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5691 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5692
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5693 if(gtk_tree_model_iter_parent(store, &iter, (GtkTreeIter *)item))
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	5694 gtk_tree_model_get(store, &iter, 3, &parent, -1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5695 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5696 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5697 return parent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5698 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5700 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5701 * Gets the item data of a tree item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5702 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5703 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5704 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5705 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5706 void *dw_tree_item_get_data(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5707 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5708 void *ret = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5709 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5710 GtkTreeModel *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5711 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5712
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5713 if(!handle \|\| !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5714 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5715
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5716 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5717 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5718 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5720 gtk_tree_model_get(store, (GtkTreeIter *)item, 2, &ret, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5721 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5722 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5723 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5724
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5725 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 * Sets this item as the active selection.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5728 * handle: Handle to the tree window (widget) to be selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5729 * item: Handle to the item to be selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5730 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5731 void dw_tree_item_select(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5732 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5733 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5734 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5735 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5736
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5737 if(!handle \|\| !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5738 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5739
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5740 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5741 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5742 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5743 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5744 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5745 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5746 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5747
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5748 gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree), path, NULL, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5749 gtk_tree_selection_select_iter(sel, (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5750 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5752 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5754
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5755 static void _dw_recursive_free(GtkTreeModel *store, GtkTreeIter parent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5756 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5757 void *data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5758 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5759
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5760 gtk_tree_model_get(store, &parent, 3, &data, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5761 if(data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5762 free(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5763 gtk_tree_store_set(GTK_TREE_STORE(store), &parent, 3, NULL, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5765 if(gtk_tree_model_iter_children(store, &iter, &parent))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 do {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5768 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5769 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5770 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5772
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 * Removes all nodes from a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5775 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5776 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5777 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778 void dw_tree_clear(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5780 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5781 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5782 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5783
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5784 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5786
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5788 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5790 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5791 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5792 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5793
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5794 if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5795 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5796 do {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5797 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5799 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 gtk_tree_store_clear(store);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5801 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5803 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5804
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5805 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5806 * Expands a node on a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5807 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808 * handle: Handle to the tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5809 * item: Handle to node to be expanded.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5810 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 void dw_tree_item_expand(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5812 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5813 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5814 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5815 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5816
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5817 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5818 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5820 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5821 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5822 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5823 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5824 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5825 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5826 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree), path, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5827 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5828 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5829 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5833 * Collapses a node on a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 * handle: Handle to the tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5836 * item: Handle to node to be collapsed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5837 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5838 void dw_tree_item_collapse(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5839 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5840 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5841 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5842 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5844 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5845 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5846
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5847 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5848 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5849 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5850 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5851 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5852 GtkTreePath path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter )item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5853 gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5854 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5855 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5857 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5859 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5860 * Removes a node from a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5861 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5862 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5863 * item: Handle to node to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5865 void dw_tree_item_delete(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5866 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5868 GtkTreeStore *store;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5869 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5870
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5871 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5872 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5873
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5874 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5875 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5876 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5877 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5878 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5879 gtk_tree_store_remove(store, (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 free(item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5881 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5883 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5884
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5885 #define _DW_CONTAINER_STORE_EXTRA 2
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5886
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5887 static int _dw_container_setup(HWND handle, unsigned long flags, char *titles, int count, int separator, int extra)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5888 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5889 int z;
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	5890 char numbuf[25] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5891 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5892 GtkListStore *store;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5893 GtkTreeViewColumn *col;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5894 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5895 GtkTreeSelection *sel;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	5896 int _dw_locked_by_me = FALSE;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5897 GType *array = calloc(count + _DW_CONTAINER_STORE_EXTRA + 1, sizeof(GType));
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5898
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5899 DW_MUTEX_LOCK;
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5900 /* Save some of the info so it is easily accessible */
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5901 g_object_set_data(G_OBJECT(handle), "_dw_cont_columns", GINT_TO_POINTER(count));
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5902 g_object_set_data(G_OBJECT(handle), "_dw_cont_extra", GINT_TO_POINTER(extra));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	5903
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5904 /* First param is row title */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5905 array[0] = G_TYPE_STRING;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5906 /* Second param is row data */
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5907 array[1] = G_TYPE_POINTER;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5908 array[2] = G_TYPE_POINTER;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5909 /* First loop... create array to create the store */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5910 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5911 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5912 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5913 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5914 array[_DW_CONTAINER_STORE_EXTRA] = GDK_TYPE_PIXBUF;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5915 array[_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5916 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5917 else if(flags[z] & DW_CFA_BITMAPORICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5918 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5919 array[z+_DW_CONTAINER_STORE_EXTRA+1] = GDK_TYPE_PIXBUF;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5920 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5921 else if(flags[z] & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5922 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5923 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5924 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925 else if(flags[z] & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5926 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5927 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_ULONG;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5928 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 else if(flags[z] & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5931 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5933 else if(flags[z] & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5934 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5935 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5936 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 /* Create the store and then the tree */
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5939 store = gtk_list_store_newv(count + _DW_CONTAINER_STORE_EXTRA + 1, array);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5940 tree = _dw_tree_setup(handle, GTK_TREE_MODEL(store));
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	5941 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5942 /* Second loop... create the columns */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5944 {
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	5945 snprintf(numbuf, 24, "_dw_cont_col%d", z);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5946 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z]));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5947 col = gtk_tree_view_column_new();
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5948 rend = NULL;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5949 void *params = calloc(sizeof(void ), 3);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	5950
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5951 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5953 rend = gtk_cell_renderer_pixbuf_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5954 gtk_tree_view_column_pack_start(col, rend, FALSE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5955 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", _DW_CONTAINER_STORE_EXTRA);
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5956 rend = gtk_cell_renderer_text_new();
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5957 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5958 gtk_tree_view_column_add_attribute(col, rend, "text", _DW_CONTAINER_STORE_EXTRA+1);
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5959 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5960 else if(flags[z] & DW_CFA_BITMAPORICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5961 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5962 rend = gtk_cell_renderer_pixbuf_new();
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5963 gtk_tree_view_column_pack_start(col, rend, FALSE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5964 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", z+_DW_CONTAINER_STORE_EXTRA+1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5965 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5966 else if(flags[z] & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5967 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5968 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5969 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5970 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5971 gtk_tree_view_column_set_resizable(col, TRUE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973 else if(flags[z] & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5976 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5977 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5978 gtk_tree_view_column_set_resizable(col, TRUE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5979 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5980 else if(flags[z] & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5981 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5982 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5984 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5985 gtk_tree_view_column_set_resizable(col, TRUE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5986 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987 else if(flags[z] & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5989 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5990 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5991 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5992 gtk_tree_view_column_set_resizable(col, TRUE);
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5993 }
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5994 g_object_set_data(G_OBJECT(col), "_dw_column", GINT_TO_POINTER(z));
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5995 params[2] = tree;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	5996 g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_dw_column_click_event), (gpointer)params, _dw_signal_disconnect, 0);
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5997 gtk_tree_view_column_set_title(col, titles[z]);
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5998 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5999 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6000 gtk_tree_view_column_set_alignment(col, 1.0);
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6001 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6002 gtk_cell_renderer_set_alignment(rend, 1.0, 0.5);
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6003 }
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6004 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6005 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6006 gtk_tree_view_column_set_alignment(col, 0.5);
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6007 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6008 gtk_cell_renderer_set_alignment(rend, 0.5, 0.5);
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	6009 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6010 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6011 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6012 /* Finish up */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6013 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6014 gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6015 gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(tree), TRUE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6017 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6018 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6021 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6022 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6023 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6024 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	6025 gtk_widget_show(tree);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6026 free(array);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	6027 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	6028 dw_window_set_font(handle, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6029 DW_MUTEX_UNLOCK;
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	6030 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6031 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6032
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6033 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6034 * Sets up the container columns.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6035 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6036 * handle: Handle to the container to be configured.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6037 * flags: An array of unsigned longs with column flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6038 * titles: An array of strings with column text titles.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 * count: The number of columns (this should match the arrays).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6040 * separator: The column number that contains the main separator.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6041 * (this item may only be used in OS/2)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6042 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6043 int dw_container_setup(HWND handle, unsigned long flags, char *titles, int count, int separator)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6044 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 return _dw_container_setup(handle, flags, titles, count, separator, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6046 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6047
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6048 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6049 * Configures the main filesystem columnn title for localization.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6050 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6051 * handle: Handle to the container to be configured.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6052 * title: The title to be displayed in the main column.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6053 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6054 void API dw_filesystem_set_column_title(HWND handle, const char *title)
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6055 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6056 char *newtitle = strdup(title ? title : "");
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6057
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	6058 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", newtitle);
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6059 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6060
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6061 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6062 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6063 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6064 * handle: Handle to the container to be configured.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6065 * flags: An array of unsigned longs with column flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6066 * titles: An array of strings with column text titles.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6067 * count: The number of columns (this should match the arrays).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6068 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6069 int dw_filesystem_setup(HWND handle, unsigned long flags, char *titles, int count)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6070 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6071 char *newtitles = malloc(sizeof(char ) * (count + 1));
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6072 unsigned long newflags = malloc(sizeof(unsigned long) (count + 1));
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	6073 char coltitle = (char )g_object_get_data(G_OBJECT(handle), "_dw_coltitle");
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6074
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6075 newtitles[0] = coltitle ? coltitle : "Filename";
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6076 newflags[0] = DW_CFA_STRINGANDICON \| DW_CFA_LEFT \| DW_CFA_HORZSEPARATOR;
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6077
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6078 memcpy(&newtitles[1], titles, sizeof(char ) count);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6079 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6080
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6081 _dw_container_setup(handle, newflags, newtitles, count + 1, 1, 1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6082
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6083 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6084 {
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	6085 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", NULL);
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6086 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6087 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6088 if ( newtitles) free(newtitles);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6089 if ( newflags ) free(newflags);
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	6090 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6091 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6092
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6093 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6094 * Obtains an icon from a module (or header in GTK).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6095 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6096 * module: Handle to module (DLL) in OS/2 and Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 * id: A unsigned long id int the resources on OS/2 and
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6098 * Windows, on GTK this is converted to a pointer
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6099 * to an embedded XPM.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6100 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6101 HICN dw_icon_load(unsigned long module, unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6102 {
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6103 return (HICN)id;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6104 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6105
1706 fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6106 /* Internal function to keep HICNs from getting too big */
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6107 GdkPixbuf _icon_resize(GdkPixbuf ret)
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6108 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6109 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6110 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6111 int pwidth = gdk_pixbuf_get_width(ret);
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6112 int pheight = gdk_pixbuf_get_height(ret);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6113
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6114 if(pwidth > 24 \|\| pheight > 24)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6115 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6116 GdkPixbuf *orig = ret;
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6117 ret = gdk_pixbuf_scale_simple(ret, pwidth > 24 ? 24 : pwidth, pheight > 24 ? 24 : pheight, GDK_INTERP_BILINEAR);
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6118 g_object_unref(G_OBJECT(orig));
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6119 }
1706 fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6120 }
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6121 return ret;
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6122 }
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6123
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6124 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6125 * Obtains an icon from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6126 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6127 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6128 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6129 * (ICO on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6130 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6131 HICN API dw_icon_load_from_file(const char *filename)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6132 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6133 int _dw_locked_by_me = FALSE;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	6134 char *file = alloca(strlen(filename) + 6);
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6135 int i, found_ext = 0;
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6136 HICN ret = 0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6137
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6138 if (!file)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6139 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6140
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6141 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6142
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6143 /* check if we can read from this file (it exists and read permission) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6144 if (access(file, 04) != 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6145 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6146 /* Try with various extentions */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6147 for ( i = 0; i < NUM_EXTS; i++ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6148 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6149 strcpy( file, filename );
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6150 strcat( file, _dw_image_exts[i] );
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6151 if ( access( file, 04 ) == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6152 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6153 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6154 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6155 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6157 if ( found_ext == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6158 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6159 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6160 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6161 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6163 DW_MUTEX_LOCK;
1706 fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1679 diff changeset	6164 ret = _icon_resize(gdk_pixbuf_new_from_file(file, NULL));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6165 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6166 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6167 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6168
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6169 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6170 * Obtains an icon from data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6171 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6172 * data: Source of data for image.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6173 * len: length of data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6174 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6175 HICN API dw_icon_load_from_data(const char *data, int len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6177 int fd, written = -1, _dw_locked_by_me = FALSE;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6178 char template[] = "/tmp/dwiconXXXXXX";
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6179 HICN ret = 0;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6180
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6181 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6182 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6183 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6184 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6185 if((fd = mkstemp(template)) != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6186 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6187 written = write(fd, data, len);
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6188 close(fd);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6189 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6190 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6191 if(fd == -1 \|\| written != len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 return 0;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6193 DW_MUTEX_LOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6194 ret = _icon_resize(gdk_pixbuf_new_from_file(template, NULL));
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6195 DW_MUTEX_UNLOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6196 unlink(template);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6197 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6198 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6199
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6200 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6201 * Frees a loaded resource in OS/2 and Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6202 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6203 * handle: Handle to icon returned by dw_icon_load().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6205 void dw_icon_free(HICN handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6206 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	6207 int iicon = GPOINTER_TO_INT(handle);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6208
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6209 if(iicon > 65535)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6210 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6211 g_object_unref(handle);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6212 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6214
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6216 * Allocates memory used to populate a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6217 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6218 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6219 * rowcount: The number of items to be populated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6220 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221 void *dw_container_alloc(HWND handle, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6222 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6223 int z, prevrowcount = 0;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6224 GtkWidget *cont;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6225 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6226 int _dw_locked_by_me = FALSE;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6227
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6228 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6229 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6230
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6231 /* Make sure it is the correct tree type */
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6232 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6233 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6234
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6235 if(store)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6236 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6237 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6238
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6239 prevrowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6240
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6241 for(z=0;z<rowcount;z++)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6242 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6243 gtk_list_store_append(store, &iter);
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6244 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6245 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(prevrowcount));
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6246 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rowcount + prevrowcount));
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6247 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6248 DW_MUTEX_UNLOCK;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6249 return (void *)cont;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6250 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6252 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 * Internal representation of dw_container_set_item() extracted so we can pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254 * two data pointers; icon and text for dw_filesystem_set_item().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6255 */
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6256 void _dw_container_set_item(HWND handle, void pointer, int column, int row, void data)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6257 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	6258 char numbuf[25] = {0}, textbuffer[101] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 int flag = 0;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6260 GtkWidget *cont;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6261 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6262 int _dw_locked_by_me = FALSE;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6263
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6264 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6265 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6266
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6267 /* Make sure it is the correct tree type */
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6268 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6269 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6270
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6271 if(store)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6272 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6273 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6274
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	6275 snprintf(numbuf, 24, "_dw_cont_col%d", column);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6276 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6277 if(pointer)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6278 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6279 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6280 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6281
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6282 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6283 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6284 if(flag & DW_CFA_STRINGANDICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6285 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6286 void thisdata = (void )data;
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6287 HICN hicon = data ? ((HICN )thisdata[0]) : 0;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6288 char tmp = data ? (char )thisdata[1] : NULL;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6289 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6290
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6291 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA, pixbuf, -1);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6292 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6293 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6294 else if(flag & DW_CFA_BITMAPORICON)
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6295 {
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6296 HICN hicon = data ? ((HICN )data) : 0;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6297 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6298
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6299 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, pixbuf, -1);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6300 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6301 else if(flag & DW_CFA_STRING)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6302 {
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6303 char tmp = data ? ((char **)data) : NULL;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6304 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6305 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6306 else if(flag & DW_CFA_ULONG)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6307 {
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6308 ULONG tmp = data ? ((ULONG )data): 0;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6309
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6310 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6311 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6312 else if(flag & DW_CFA_DATE)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6313 {
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6314 if(data)
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6315 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6316 struct tm curtm;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6317 CDATE cdate = ((CDATE )data);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6318
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6319 memset( &curtm, 0, sizeof(curtm) );
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6320 curtm.tm_mday = cdate.day;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6321 curtm.tm_mon = cdate.month - 1;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6322 curtm.tm_year = cdate.year - 1900;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6323
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6324 strftime(textbuffer, 100, "%x", &curtm);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6325 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6326 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6327 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6328 else if(flag & DW_CFA_TIME)
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6329 {
1501 7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6330 if(data)
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6331 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6332 struct tm curtm;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6333 CTIME ctime = ((CTIME )data);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6334
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6335 memset( &curtm, 0, sizeof(curtm) );
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6336 curtm.tm_hour = ctime.hours;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6337 curtm.tm_min = ctime.minutes;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6338 curtm.tm_sec = ctime.seconds;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6339
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6340 strftime(textbuffer, 100, "%X", &curtm);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6341 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6342 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6343 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6344 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6345 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6346 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6347 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6349 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6350 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6351 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6352 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6353 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6354 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6355 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6356 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6357 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6358 void dw_container_set_item(HWND handle, void pointer, int column, int row, void data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6359 {
835 82072ff08513 Removed some GTK_IS_TREE_VIEW checks that were erroneously dropping out of valid requests. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 830 diff changeset	6360 _dw_container_set_item(handle, pointer, column, row, data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6361 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6362
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6363 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6364 * Changes an existing item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6365 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6366 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6367 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6368 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6369 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6371 void dw_container_change_item(HWND handle, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6373 _dw_container_set_item(handle, NULL, column, row, data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6374 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6376 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6377 * Changes an existing item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6378 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6379 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6381 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6382 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6384 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6385 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6386 dw_filesystem_set_item(handle, NULL, column, row, data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6390 * Changes an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6391 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6392 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6393 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6395 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6396 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6397 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6398 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6399 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6400 dw_filesystem_set_file(handle, NULL, row, filename, icon);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6401 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6402
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6403 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6404 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6405 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6406 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6407 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6408 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6409 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6410 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6411 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6412 void dw_filesystem_set_file(HWND handle, void pointer, int row, const char filename, HICN icon)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6413 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6414 void data[2] = { (void )&icon, (void *)filename };
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6415
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6416 _dw_container_set_item(handle, pointer, 0, row, (void *)data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6417 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6418
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6419 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6420 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6421 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6423 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6425 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6426 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6427 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6428 void dw_filesystem_set_item(HWND handle, void pointer, int column, int row, void data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6429 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6430 _dw_container_set_item(handle, pointer, column + 1, row, data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6431 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6432
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6433 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6434 * Gets column type for a container column
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6435 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6437 * column: Zero based column.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6438 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6439 int dw_container_get_column_type(HWND handle, int column)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6440 {
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	6441 char numbuf[25] = {0};
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	6442 int flag, rc = 0;
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	6443 GtkWidget *cont = handle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6444 int _dw_locked_by_me = FALSE;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6445
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6446 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6447 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6448 if(!cont)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6449 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6450 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6451 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6452 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6453
2199 8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2197 diff changeset	6454 snprintf(numbuf, 24, "_dw_cont_col%d", column);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6455 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6456
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6457 if(flag & DW_CFA_BITMAPORICON)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6458 rc = DW_CFA_BITMAPORICON;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459 else if(flag & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6460 rc = DW_CFA_STRING;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6461 else if(flag & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6462 rc = DW_CFA_ULONG;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6463 else if(flag & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6464 rc = DW_CFA_DATE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6465 else if(flag & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6466 rc = DW_CFA_TIME;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6467 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6468 rc = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6469 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6470 return rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6471 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6474 * Gets column type for a filesystem container column
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6475 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6477 * column: Zero based column.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6478 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479 int API dw_filesystem_get_column_type(HWND handle, int column)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6480 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6481 return dw_container_get_column_type( handle, column + 1 );
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6482 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6483
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6484 /*
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6485 * Sets the alternating row colors for container window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6486 * Parameters:
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6487 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6488 * oddcolor: Odd row background color in DW_RGB format or a default color index.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6489 * evencolor: Even row background color in DW_RGB format or a default color index.
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6490 * DW_RGB_TRANSPARENT will disable coloring rows.
70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6491 * DW_CLR_DEFAULT will use the system default alternating row colors.
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6492 */
1291 b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1289 diff changeset	6493 void API dw_container_set_stripe(HWND handle, unsigned long oddcolor, unsigned long evencolor)
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6494 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6495 #if !GTK_CHECK_VERSION(3,14,0)
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6496 GtkWidget *cont;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6497 int _dw_locked_by_me = FALSE;
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6498 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6499 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6500
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6501 /* Make sure it is the correct tree type */
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6502 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6503 {
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6504 if(oddcolor == DW_RGB_TRANSPARENT && evencolor == DW_RGB_TRANSPARENT)
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6505 gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cont), FALSE);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6506 else
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6507 gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cont), TRUE);
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6508 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6509 DW_MUTEX_UNLOCK;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6510 #endif
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6511 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6512
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6513 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6514 * Sets the width of a column in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6515 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6516 * handle: Handle to window (widget) of container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6517 * column: Zero based column of width being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6518 * width: Width of column in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6519 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6520 void dw_container_set_column_width(HWND handle, int column, int width)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6521 {
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6522 GtkWidget *cont;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6523 int _dw_locked_by_me = FALSE;
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6524
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6525 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6526 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6527
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6528 /* Make sure it is the correct tree type */
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6529 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6530 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6531 GtkTreeViewColumn *col = gtk_tree_view_get_column(GTK_TREE_VIEW(cont), column);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6532
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6533 if(col && GTK_IS_TREE_VIEW_COLUMN(col))
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6534 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6535 gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(col), width);
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6536 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6537 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6538 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6539 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6540
820 19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6541 /* Internal version for both */
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6542 void _dw_container_set_row_data(HWND handle, void pointer, int row, int type, void data)
820 19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6543 {
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6544 GtkWidget *cont = handle;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6545 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6546 int _dw_locked_by_me = FALSE;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6547
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6548 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6549 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6550 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6551 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6552
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6553 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6554 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6555 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6556
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6557 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6558 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6559 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6560 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6561
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6562 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6563 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6564 gtk_list_store_set(store, &iter, type, (gpointer)data, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6565 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6566 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6567 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6568 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6569
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6570 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6571 * Sets the title of a row in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6572 * Parameters:
820 19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6573 * pointer: Pointer to the allocated memory in dw_container_alloc().
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6574 * row: Zero based row of data being set.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6575 * title: String title of the item.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6576 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6577 void dw_container_set_row_title(void pointer, int row, const char title)
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6578 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6579 _dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_STRING, (void *)title);
820 19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6580 }
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6581
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6582 /*
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6583 * Changes the title of a row already inserted in the container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6584 * Parameters:
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6585 * handle: Handle to window (widget) of container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6586 * row: Zero based row of data being set.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6587 * title: String title of the item.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6588 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6589 void dw_container_change_row_title(HWND handle, int row, const char *title)
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6590 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6591 _dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_STRING, (void *)title);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6592 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6593
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6594 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6595 * Sets the data of a row in the container.
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6596 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6597 * pointer: Pointer to the allocated memory in dw_container_alloc().
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6598 * row: Zero based row of data being set.
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6599 * data: Data pointer.
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6600 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6601 void dw_container_set_row_data(void pointer, int row, void data)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6602 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6603 _dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_POINTER, data);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6604 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6605
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6606 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6607 * Changes the data of a row already inserted in the container.
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6608 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6609 * handle: Handle to window (widget) of container.
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6610 * row: Zero based row of data being set.
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6611 * data: Data pointer.
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6612 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6613 void dw_container_change_row_data(HWND handle, int row, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6614 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6615 _dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_POINTER, data);
820 19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6616 }
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6617
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6618 /*
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6619 * Sets the title of a row in the container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 818 diff changeset	6620 * Parameters:
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6621 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6622 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6623 * rowcount: The number of rows to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6624 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625 void dw_container_insert(HWND handle, void *pointer, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6627 /* Don't need to do anything here */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6628 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6630 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6631 * Removes the first x rows from a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6632 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6633 * handle: Handle to the window (widget) to be deleted from.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 * rowcount: The number of rows to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6635 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6636 void dw_container_delete(HWND handle, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6637 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6638 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6639 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6640 int _dw_locked_by_me = FALSE;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6641
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6642 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6643 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6644
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6645 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6646 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6647 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6648
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6649 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6650 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6651 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6652 int rows, z;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6653
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6654 rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6655
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6656 for(z=0;z<rowcount;z++)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6657 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6658 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6659 gtk_list_store_remove(store, &iter);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6660 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6661
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6662 if(rows - rowcount < 0)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6663 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6664 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6665 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6666
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6667 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6668 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6669 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6670 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6671
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6672 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6673 * Removes all rows from a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6674 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6675 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6676 * redraw: TRUE to cause the container to redraw immediately.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6678 void dw_container_clear(HWND handle, int redraw)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6679 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6680 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6681 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6682 int _dw_locked_by_me = FALSE;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6683
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6684 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6685 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6686
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6687 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6688 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6689 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6690
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6691 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6692 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6693 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(0));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6694 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(0));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6695
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6696 gtk_list_store_clear(store);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6697 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6698 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6699 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6700
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6701 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6702 * Scrolls container up or down.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6703 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6704 * handle: Handle to the window (widget) to be scrolled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6705 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6706 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6707 * rows: The number of rows to be scrolled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6708 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6709 void dw_container_scroll(HWND handle, int direction, long rows)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6710 {
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6711 GtkWidget *cont;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6712 int _dw_locked_by_me = FALSE;
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6713
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6714 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6715 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6716
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6717 /* Make sure it is the correct tree type */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6718 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6719 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	6720 GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(cont));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6721
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6722 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6723 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6724 gint rowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6725 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6726 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6727 gdouble lower = gtk_adjustment_get_lower(adjust);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6728 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6729
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6730 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6731 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6732 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6733 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6734 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6735 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6736
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6737 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6738
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6739 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6740 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6741 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6742 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6743 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6744 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6745 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6746 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6747 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6748 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6749 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6750 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6751 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6752 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6753 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6754 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6755 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6756 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6757 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6758 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6759 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6760 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6761 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6762 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6763 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6764 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6765 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6766 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6767 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6768 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6769 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6770 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6771 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6772 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6773 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6774 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6775 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6776
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6777 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6778 * Starts a new query of a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6779 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6780 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6781 * flags: If this parameter is DW_CRA_SELECTED it will only
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6782 * return items that are currently selected. Otherwise
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6783 * it will return all records in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6784 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6785 char *dw_container_query_start(HWND handle, unsigned long flags)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6786 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6787 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6788 GtkListStore *store = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6789 char *retval = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6790 int _dw_locked_by_me = FALSE;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6791 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6792
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6793 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6794 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6795
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6796 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6797 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6798 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6799
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6800 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6801 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6802 /* These should be separate but right now this will work */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6803 if(flags & DW_CRA_SELECTED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6804 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6805 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6806 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6807 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6808 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6809 GtkTreePath *path = g_list_nth_data(list, 0);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6810
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6811 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6812 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6813 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6814
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6815 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6816 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6817 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6818
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6819 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6820 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6821 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6822 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6823 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6824 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6825 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6826 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6827 g_list_free(list);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6828 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6829 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6830 else if(flags & DW_CRA_CURSORED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6831 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6832 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6833
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6834 gtk_tree_view_get_cursor(GTK_TREE_VIEW(cont), &path, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6835 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6836 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6837 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6838
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6839 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6840 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6841 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6842 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6843 gtk_tree_path_free(path);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6844 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6845 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6846 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6847 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6848 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6849
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6850 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6851 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6852 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6853 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6854 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6855 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6856 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6857 /* If there is a title, duplicate it and free the temporary copy */
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6858 if(retval && type == _DW_DATA_TYPE_STRING)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6859 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6860 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6861 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6862 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6863 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6864 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6865 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6866 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6867
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6868 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6869 * Continues an existing query of a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6870 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6871 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6872 * flags: If this parameter is DW_CRA_SELECTED it will only
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6873 * return items that are currently selected. Otherwise
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6874 * it will return all records in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6875 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 char *dw_container_query_next(HWND handle, unsigned long flags)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6877 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6878 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6879 GtkListStore *store = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6880 char *retval = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6881 int _dw_locked_by_me = FALSE;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6882 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6884 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6885 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6886
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6887 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6888 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6889 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6890
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6891 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6892 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6893 int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_querypos"));
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6894 int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6895
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6896 /* These should be separate but right now this will work */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6897 if(flags & DW_CRA_SELECTED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6898 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6899 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6900 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6901
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6902 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6903 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6904 GtkTreePath *path = g_list_nth_data(list, pos);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6905
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6906 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6907 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6908 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6909
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6910 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6911 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6912 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6913
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6914 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6915 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6916 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6917 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6918 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6919 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6920 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6921 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6922 g_list_free(list);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6923 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6924 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6925 else if(flags & DW_CRA_CURSORED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6926 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6927 /* There will only be one item cursored,
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6928 * retrieve it with dw_container_query_start()
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6929 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6930 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6931 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6932 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6933 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6934 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6935
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6936 if(pos < count && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, pos))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6937 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6938 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6939 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6940 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6941 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6942 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6943 /* If there is a title, duplicate it and free the temporary copy */
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6944 if(retval && type == _DW_DATA_TYPE_STRING)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6945 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6946 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6947 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6948 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6949 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6950 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6951 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6953
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6954 int _dw_find_iter(GtkListStore store, GtkTreeIter iter, void *data, int textcomp)
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6955 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6956 int z, rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6957 void *thisdata;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6958 int retval = FALSE;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6959
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6960 for(z=0;z<rows;z++)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6961 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6962 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), iter, NULL, z))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6963 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6964 /* Get either string from position 0 or pointer from position 1 */
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6965 gtk_tree_model_get(GTK_TREE_MODEL(store), iter, textcomp ? _DW_DATA_TYPE_STRING : _DW_DATA_TYPE_POINTER, &thisdata, -1);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6966 if((textcomp && thisdata && strcmp((char )thisdata, (char )data) == 0) \|\| (!textcomp && thisdata == data))
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6967 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6968 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6969 z = rows;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6970 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6971 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6972 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6973 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6974 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6975 return retval;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6976 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6977
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6978 void _dw_container_cursor(HWND handle, void *data, int textcomp)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6979 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6980 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6981 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	6982 int _dw_locked_by_me = FALSE;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6983
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6984 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6985 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6986
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6987 /* Make sure it is the correct tree type */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6988 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6989 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6990
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6991 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6992 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6993 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6994
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	6995 if(_dw_find_iter(store, &iter, data, textcomp))
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6996 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6997 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6998
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6999 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7000 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7001 gtk_tree_view_row_activated(GTK_TREE_VIEW(cont), path, NULL);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7002 gtk_tree_path_free(path);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7003 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7004 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7005 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7006 DW_MUTEX_UNLOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7007 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7008
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7009 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7010 * Cursors the item with the text speficied, and scrolls to that item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7011 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7012 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7013 * text: Text usually returned by dw_container_query().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7014 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7015 void dw_container_cursor(HWND handle, const char *text)
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7016 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7017 _dw_container_cursor(handle, (void *)text, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7018 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7019
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7020 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7021 * Cursors the item with the text speficied, and scrolls to that item.
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7022 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7023 * handle: Handle to the window (widget) to be queried.
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7024 * text: Text usually returned by dw_container_query().
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7025 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7026 void dw_container_cursor_by_data(HWND handle, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7027 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7028 _dw_container_cursor(handle, data, FALSE);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7029 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7030
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7031 void _dw_container_delete_row(HWND handle, void *data, int textcomp)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7032 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7033 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7034 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7035 int _dw_locked_by_me = FALSE;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7036
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7037 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7038 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7039
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7040 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7041 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7042 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7043
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7044 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7045 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7046 GtkTreeIter iter;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7047 int rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7048
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7049 if(_dw_find_iter(store, &iter, data, textcomp))
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7050 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7051 gtk_list_store_remove(store, &iter);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7052 rows--;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7053 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7054
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7055 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7056 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7057 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7058 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7060 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7061 * Deletes the item with the text speficied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7062 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7063 * handle: Handle to the window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7064 * text: Text usually returned by dw_container_query().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7065 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7066 void dw_container_delete_row(HWND handle, const char *text)
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7067 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7068 _dw_container_delete_row(handle, (void *)text, TRUE);
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7069 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7070
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7071 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7072 * Deletes the item with the text speficied.
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7073 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7074 * handle: Handle to the window (widget).
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7075 * text: Text usually returned by dw_container_query().
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7076 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7077 void dw_container_delete_row_by_data(HWND handle, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7078 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7079 _dw_container_delete_row(handle, data, FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7080 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7081
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7082 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7083 * Optimizes the column widths so that all data is visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7084 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7085 * handle: Handle to the window (widget) to be optimized.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7086 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7087 void dw_container_optimize(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7088 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7089 GtkWidget *cont;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7090 int _dw_locked_by_me = FALSE;
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7091
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7092 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7093 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7094
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7095 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7096 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7097 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7098 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7099 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7100
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7101 /* Translate the status message into a message on our buddy window */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7102 static void _dw_status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7103 {
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7104 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7105 long x, y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7106 gboolean retval;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7107
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7108 dw_pointer_query_pos(&x, &y);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7109
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7110 event.button = button;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7111 event.x = x;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7112 event.y = y;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7113
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7114 g_signal_emit_by_name(G_OBJECT(user_data), "button_press_event", &event, &retval);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7115 }
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7116
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7118 * Inserts an icon into the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7119 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7120 * handle: Window handle that will handle taskbar icon messages.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7121 * icon: Icon handle to display in the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7122 * bubbletext: Text to show when the mouse is above the icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7123 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7124 void dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7125 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7126 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7127 GdkPixbuf *pixbuf;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7128 int _dw_locked_by_me = FALSE;
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7129
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7130 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7131 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7132 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7133 if(bubbletext)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7134 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7135 g_object_set_data(G_OBJECT(handle), "_dw_taskbar", status);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7136 g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_dw_status_translate), handle);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7137 gtk_status_icon_set_visible(status, TRUE);
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7138 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7139 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7140
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7141 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7142 * Deletes an icon from the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7143 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7144 * handle: Window handle that was used with dw_taskbar_insert().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7145 * icon: Icon handle that was used with dw_taskbar_insert().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7146 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7147 void dw_taskbar_delete(HWND handle, HICN icon)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7148 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7149 GtkStatusIcon *status;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7150 int _dw_locked_by_me = FALSE;
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7151
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7152 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7153 status = g_object_get_data(G_OBJECT(handle), "_dw_taskbar");
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7154 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7155 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7156 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7157
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7158 /* Make sure the widget is out of the dirty list if it is destroyed */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7159 static void _dw_render_destroy(GtkWidget *widget, gpointer data)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7160 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7161 _dw_dirty_list = g_list_remove(_dw_dirty_list, widget);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7162 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7163
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7165 * Creates a rendering context widget (window) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7166 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7167 * id: An id to be used with dw_window_from_id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169 * A handle to the widget or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7170 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 HWND dw_render_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7172 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7173 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7174 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7175
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7176 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7177 tmp = gtk_drawing_area_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7178 gtk_widget_set_events(tmp, GDK_EXPOSURE_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7179 \| GDK_LEAVE_NOTIFY_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180 \| GDK_BUTTON_PRESS_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7181 \| GDK_BUTTON_RELEASE_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7182 \| GDK_KEY_PRESS_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 \| GDK_POINTER_MOTION_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7184 \| GDK_POINTER_MOTION_HINT_MASK);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7185 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7186 g_signal_connect(G_OBJECT(tmp), "destroy", G_CALLBACK(_dw_render_destroy), NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7187 gtk_widget_set_can_focus(tmp, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7188 gtk_widget_show(tmp);
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	7189 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	7190 dw_window_set_font(tmp, _DWDefaultFont);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7191 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7192 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7193 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7194
2355 fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7195 /*
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7196 * Invalidate the render widget triggering an expose event.
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7197 * Parameters:
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7198 * handle: A handle to a render widget to be redrawn.
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7199 */
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7200 void API dw_render_redraw(HWND handle)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7201 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7202 int _dw_locked_by_me = FALSE;
2355 fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7203
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7204 DW_MUTEX_LOCK;
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7205 if(handle && GTK_IS_WIDGET(handle))
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7206 gtk_widget_queue_draw(handle);
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7207 DW_MUTEX_UNLOCK;
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7208 }
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2349 diff changeset	7209
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7210 /* Returns a GdkRGBA from a DW color */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7211 static GdkRGBA _dw_internal_color(unsigned long value)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7213 if(DW_RGB_COLOR & value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7215 GdkRGBA color = { (gfloat)DW_RED_VALUE(value) / 255.0, (gfloat)DW_GREEN_VALUE(value) / 255.0, (gfloat)DW_BLUE_VALUE(value) / 255.0, 1.0 };
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7216 return color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7217 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7218 if (value < 16)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7219 return _dw_colors[value];
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7220 return _dw_colors[0];
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7221 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7223 /* Sets the current foreground drawing color.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7224 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7225 * red: red value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7226 * green: green value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7227 * blue: blue value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7228 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7229 void dw_color_foreground_set(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7230 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7231 GdkRGBA color = _dw_internal_color(value);
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7232 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7233
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7234 *foreground = color;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7235 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7236
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 /* Sets the current background drawing color.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7238 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7239 * red: red value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7240 * green: green value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7241 * blue: blue value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7242 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7243 void dw_color_background_set(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7244 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7245 GdkRGBA *background = pthread_getspecific(_dw_bg_color_key);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7246
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7247 if(value == DW_CLR_DEFAULT)
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7248 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7249 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7250 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7251 pthread_setspecific(_dw_bg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7252 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7253 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7254 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7255 else
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7256 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7257 GdkRGBA color = _dw_internal_color(value);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7258
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7259 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7260 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7261 background = malloc(sizeof(GdkRGBA));
972 32830f1683c9 Fixed an issue where dw_color_background_set() would not function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 971 diff changeset	7262 pthread_setspecific(_dw_bg_color_key, background);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7263 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7264 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7265 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7266 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7267
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7268 #if GTK_CHECK_VERSION(3,3,11)
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7269 /* Allows the user to choose a color using the system's color chooser dialog.
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7270 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7271 * value: current color
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7272 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7273 * The selected color or the current color if cancelled.
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7274 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7275 unsigned long API dw_color_choose(unsigned long value)
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7276 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7277 GtkColorChooser *cd;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7278 GdkRGBA color = _dw_internal_color(value);
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7279 int _dw_locked_by_me = FALSE;
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7280 unsigned long retcolor = value;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7281
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7282 DW_MUTEX_LOCK;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7283 cd = (GtkColorChooser *)gtk_color_chooser_dialog_new("Choose color", NULL);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7284 gtk_color_chooser_set_use_alpha(cd, FALSE);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7285 gtk_color_chooser_set_rgba(cd, &color);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7286
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7287 gtk_widget_show(GTK_WIDGET(cd));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7288
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7289 if(gtk_dialog_run(GTK_DIALOG(cd)) == GTK_RESPONSE_OK)
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7290 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7291 gtk_color_chooser_get_rgba(cd, &color);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7292 retcolor = DW_RGB((int)(color.red * 255), (int)(color.green * 255), (int)(color.blue * 255));
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7293 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7294 gtk_widget_destroy(GTK_WIDGET(cd));
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7295 DW_MUTEX_UNLOCK;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7296 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7297 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7298 #else
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7299 static int _dw_color_active = 0;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7300
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7301 /* Internal function to handle the color OK press */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7302 static gint _dw_color_ok(GtkWidget widget, DWDialog dwwait)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7303 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7304 GdkRGBA color;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7305 unsigned long dw_color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7306 GtkColorSelection *colorsel;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7307
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 if(!dwwait)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 colorsel = (GtkColorSelection *)gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dwwait->data));
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7312 gtk_color_selection_get_current_rgba(colorsel, &color);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313 gtk_widget_destroy(GTK_WIDGET(dwwait->data));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7314 _dw_color_active = 0;
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7315 dw_color = DW_RGB((int)(color.red * 255), (int)(color.green * 255), (int)(color.blue * 255));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7316 dw_dialog_dismiss(dwwait, (void *)dw_color);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7317 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7318 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 /* Internal function to handle the color Cancel press */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7321 static gint _dw_color_cancel(GtkWidget widget, DWDialog dwwait)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7322 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7323 if(!dwwait)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7324 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7326 gtk_widget_destroy(GTK_WIDGET(dwwait->data));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7327 _dw_color_active = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7328 dw_dialog_dismiss(dwwait, (void *)-1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7329 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7332 /* Allows the user to choose a color using the system's color chooser dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7333 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 * value: current color
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7335 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7336 * The selected color or the current color if cancelled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7337 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 unsigned long API dw_color_choose(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7339 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7340 GtkWidget colorw, ok_button, *cancel_button;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7341 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7342 DWDialog *dwwait;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7343 GtkColorSelection *colorsel;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7344 GdkRGBA color = _dw_internal_color(value);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7345 unsigned long dw_color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7346
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7347 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7349 /* The DW mutex should be sufficient for
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7350 * insuring no thread changes this unknowingly.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7351 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352 if(_dw_color_active)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7355 return value;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7357
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7358 _dw_color_active = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7359
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7360 colorw = gtk_color_selection_dialog_new("Select Color");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 dwwait = dw_dialog_new((void *)colorw);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364 colorsel = (GtkColorSelection *)gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(colorw));
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7365 g_object_get(G_OBJECT(colorw), "ok-button", &ok_button, "cancel-button", &cancel_button, NULL);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7366 g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(_dw_color_ok), dwwait);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	7367 g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(_dw_color_cancel), dwwait);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7368
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7369 gtk_color_selection_set_previous_rgba(colorsel,&color);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7370 gtk_color_selection_set_current_rgba(colorsel,&color);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7371 gtk_color_selection_set_has_palette(colorsel,TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7372
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 gtk_widget_show(colorw);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375 dw_color = (unsigned long)dw_dialog_wait(dwwait);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7376 if ((unsigned long)dw_color == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7377 dw_color = value;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7378 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7379 return (unsigned long)dw_color;
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7380 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7381 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7383 /* Draw a point on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7384 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7385 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7386 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7387 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7388 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7389 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7390 void dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7391 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7392 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7393 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7394 int cached = FALSE;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7395 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7396 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7397 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7398 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7399
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7400 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7401 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7402 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7403 GdkDisplay *display = gdk_display_get_default();
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7404
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7405 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7406 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7407 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7408 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7409 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7410 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7411 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7412 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7413 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7414 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7415 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7416 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7417 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7418 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7419 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7420 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7421 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7422 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7423 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7424 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7425 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7426 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7427 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7428 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7429 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7430 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7431 else if(pixmap)
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7432 cr = cairo_create(pixmap->image);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7433 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7434 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7435 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7436
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7437 gdk_cairo_set_source_rgba(cr, foreground);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7438 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7439 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7440 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7441 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7442 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7443 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7444 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7445 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7446 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7447 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7448 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7449 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7450 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7451 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7452 cairo_destroy(cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7453 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7455 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7456
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7457 /* Draw a line on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7458 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7459 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7460 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7461 * x1: First X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7462 * y1: First Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7463 * x2: Second X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7464 * y2: Second Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7465 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 void dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7467 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7468 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7469 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7470 int cached = FALSE;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7471 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7472 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7473 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7474 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7476 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7477 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7478 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7479 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7480
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7481 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7482 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7483 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7484 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7485 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7486 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7487 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7488 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7489 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7490 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7491 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7492 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7493 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7494 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7495 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7496 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7497 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7498 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7499 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7500 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7501 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7502 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7503 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7504 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7505 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7506 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7507 else if(pixmap)
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7508 cr = cairo_create(pixmap->image);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7509 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7510 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7511 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7512
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7513 gdk_cairo_set_source_rgba(cr, foreground);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7514 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7515 cairo_move_to(cr, x1, y1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 cairo_line_to(cr, x2, y2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7517 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7518 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7519 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7520 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7521 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7522 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7523 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7524 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7525 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7526 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7527 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7528 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7529 cairo_destroy(cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7530 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7531 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7533
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7534 /* Draw a closed polygon on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7535 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7536 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7537 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7538 * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0).
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7539 * number of points
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7540 * x[]: X coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7541 * y[]: Y coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7542 */
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7543 void dw_draw_polygon(HWND handle, HPIXMAP pixmap, int flags, int npoints, int x, int y)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7544 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7545 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7546 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7547 int cached = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7548 int z;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7549 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7550 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7551 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7552 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7554 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7555 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7556 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7557 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7558
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7559 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7560 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7561 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7562 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7563 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7564 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7565 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7566 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7567 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7568 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7569 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7570 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7571 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7572 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7573 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7574 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7575 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7576 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7577 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7578 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7579 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7580 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7581 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7582 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7583 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7584 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 else if(pixmap)
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7586 cr = cairo_create(pixmap->image);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7587 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7588 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7589 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7590
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7591 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7592 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7593
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7594 gdk_cairo_set_source_rgba(cr, foreground);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7595 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7596 cairo_move_to(cr, x[0], y[0]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7597 for(z=1;z<npoints;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7598 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599 cairo_line_to(cr, x[z], y[z]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7600 }
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7601 if(flags & DW_DRAW_FILL)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7602 cairo_fill(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7603 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7604 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7605 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7606 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7607 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7608 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7609 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7610 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7611 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7612 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7613 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7614 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7615 cairo_destroy(cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7619
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7620 /* Draw a rectangle on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7621 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7622 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7623 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7624 * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0).
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7625 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7626 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7627 * width: Width of rectangle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 * height: Height of rectangle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7629 */
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7630 void dw_draw_rect(HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7632 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7633 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7634 int cached = FALSE;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7635 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7636 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7637 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7638 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7639
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7640 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7641 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7642 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7643 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7644
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7645 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7646 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7647 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7648 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7649 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7650 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7651 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7652 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7653 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7654 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7655 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7656 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7657 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7658 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7659 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7660 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7661 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7662 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7663 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7664 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7665 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7666 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7667 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7668 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7669 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7670 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671 else if(pixmap)
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7672 cr = cairo_create(pixmap->image);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7673 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7674 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7675 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7676
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7677 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7678 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7679
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7680 gdk_cairo_set_source_rgba(cr, foreground);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7681 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7682 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7683 cairo_line_to(cr, x, y + height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7684 cairo_line_to(cr, x + width, y + height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7685 cairo_line_to(cr, x + width, y);
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7686 if(flags & DW_DRAW_FILL)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7687 cairo_fill(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7688 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7689 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7690 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7691 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7692 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7693 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7694 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7695 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7696 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7697 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7698 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7699 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7700 cairo_destroy(cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7703 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7705 /* Draw an arc on a window (preferably a render window).
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7706 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7707 * handle: Handle to the window.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7708 * pixmap: Handle to the pixmap. (choose only one of these)
1275 0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7709 * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0).
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1271 diff changeset	7710 * DW_DRAW_FULL will draw a complete circle/elipse.
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7711 * xorigin: X coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7712 * yorigin: Y coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7713 * x1: X coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7714 * y1: Y coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7715 * x2: X coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7716 * y2: Y coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7717 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7718 void API dw_draw_arc(HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7719 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7720 int _dw_locked_by_me = FALSE;
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7721 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7722 int cached = FALSE;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7723 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7724 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7725 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7726 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7727
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7728 DW_MUTEX_LOCK;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7729 if(handle)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7730 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7731 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7732
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7733 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7734 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7735 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7736 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7737 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7738 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7739 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7740 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7741 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7742 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7743 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7744 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7745 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7746 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7747 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7748 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7749 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7750 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7751 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7752 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7753 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7754 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7755 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7756 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7757 }
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7758 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7759 else if(pixmap)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7760 cr = cairo_create(pixmap->image);
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7761 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7762 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7763 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7764 int width = abs(x2-x1);
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7765 float scale = fabs((float)(y2-y1))/(float)width;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7766
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7767 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7768 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7769
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7770 gdk_cairo_set_source_rgba(cr, foreground);
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7771 cairo_set_line_width(cr, 1);
1283 87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7772 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7773 cairo_scale(cr, 1.0, scale);
1271 8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1266 diff changeset	7774 if(flags & DW_DRAW_FULL)
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7775 cairo_arc(cr, xorigin, yorigin / scale, width/2, 0, M_PI*2);
1271 8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1266 diff changeset	7776 else
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7777 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7778 double dx = xorigin - x1;
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7779 double dy = yorigin - y1;
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7780 double r = sqrt(dxdx + dydy);
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7781 double a1 = atan2((y1-yorigin), (x1-xorigin));
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7782 double a2 = atan2((y2-yorigin), (x2-xorigin));
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7783
1271 8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1266 diff changeset	7784 cairo_arc(cr, xorigin, yorigin, r, a1, a2);
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7785 }
1271 8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1266 diff changeset	7786 if(flags & DW_DRAW_FILL)
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1266 diff changeset	7787 cairo_fill(cr);
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7788 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7789 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7790 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7791 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7792 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7793 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7794 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7795 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7796 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7797 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7798 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7799 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7800 cairo_destroy(cr);
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7801 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7802 DW_MUTEX_UNLOCK;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7803 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7804
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7805 /* Draw text on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7806 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7807 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7809 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7810 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7811 * text: Text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7812 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7813 void dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7814 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7815 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7816 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7817 int cached = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7818 PangoFontDescription *font;
1232 db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7819 char tmpname, fontname = "monospace 10";
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7820 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7821 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7822 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7823 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825 if(!text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7826 return;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7827
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7828 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 if(handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7830 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7831 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7832
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7833 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7834 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7835 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7836 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7837 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7838 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7839 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7840 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7841 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7842 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7843 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7844 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7845 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7846 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7847 cr = gdk_drawing_context_get_cairo_context(dc);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7848 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7849 cr = gdk_cairo_create(window);
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7850 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7851 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7852 fontname = tmpname;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7853 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7854 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7855 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7856 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7857 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7858 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7859 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7860 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 else if(pixmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7862 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7863 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7864 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7865 else if(pixmap->handle && (tmpname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname")))
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7866 fontname = tmpname;
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7867 cr = cairo_create(pixmap->image);
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7868 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7869 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7870 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7871 font = pango_font_description_from_string(fontname);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7872 if(font)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7873 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7874 PangoContext *context = pango_cairo_create_context(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7876 if(context)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7877 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7878 PangoLayout *layout = pango_layout_new(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7879
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880 if(layout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7881 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7882 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7883 GdkRGBA *background = pthread_getspecific(_dw_bg_color_key);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7884
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7885 pango_layout_set_font_description(layout, font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7886 pango_layout_set_text(layout, text, strlen(text));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7887
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7888 gdk_cairo_set_source_rgba(cr, foreground);
892 82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7889 /* Create a background color attribute if required */
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7890 if(background)
892 82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7891 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7892 PangoAttrList *list = pango_layout_get_attributes(layout);
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7893 PangoAttribute attr = pango_attr_background_new((guint16)(background->red 65535),
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7894 (guint16)(background->green * 65535),
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7895 (guint16)(background->blue* 65535));
892 82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7896 if(!list)
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7897 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7898 list = pango_attr_list_new();
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7899 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7900 pango_attr_list_change(list, attr);
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7901 pango_layout_set_attributes(layout, list);
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7902 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7903 /* Do the drawing */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7904 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 pango_cairo_show_layout (cr, layout);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7906
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7907 g_object_unref(layout);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7908 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7909 g_object_unref(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7910 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7911 pango_font_description_free(font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7912 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7913 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7914 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7915 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7916 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7917 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7918 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7919 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7920 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7921 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7922 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7923 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	7924 cairo_destroy(cr);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7925 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7927 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7928
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7929 /* Query the width and height of a text string.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7930 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7931 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7932 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7933 * text: Text to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7934 * width: Pointer to a variable to be filled in with the width.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7935 * height Pointer to a variable to be filled in with the height.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7936 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7937 void dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char text, int width, int *height)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7938 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	7939 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7940 PangoFontDescription *font;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7941 char *fontname = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7942 int free_fontname = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7943
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 if(!text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7945 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7946
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7947 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7948 if(handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7949 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7950 fontname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7951 if ( fontname == NULL )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 fontname = dw_window_get_font(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7954 free_fontname = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7955 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7956 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7957 else if(pixmap)
1232 db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7958 {
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7959 if(pixmap->font)
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7960 fontname = pixmap->font;
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7961 else if(pixmap->handle)
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7962 fontname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname");
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1223 diff changeset	7963 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7965 font = pango_font_description_from_string(fontname ? fontname : "monospace 10");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7966 if(font)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7967 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7968 PangoContext *context = gdk_pango_context_get();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7969
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7970 if(context)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7971 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7972 PangoLayout *layout = pango_layout_new(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7973
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7974 if(layout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 PangoRectangle rect;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7977
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7978 pango_layout_set_font_description(layout, font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7979 pango_layout_set_text(layout, text, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7980 pango_layout_get_pixel_extents(layout, NULL, &rect);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7981
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982 if(width)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7983 *width = rect.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 if(height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7985 *height = rect.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7987 g_object_unref(layout);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7988 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7989 g_object_unref(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991 pango_font_description_free(font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993 if ( free_fontname )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7994 free( fontname );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7996 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7998 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7999 * Creates a pixmap with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8000 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 * or zero to enable this pixmap to be written
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8003 * off the screen to reduce flicker
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8004 * width: Width of the pixmap in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8005 * height: Height of the pixmap in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8006 * depth: Color depth of the pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8007 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8009 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 HPIXMAP dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8011 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8012 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8013 HPIXMAP pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8017
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 if (!depth)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8019 depth = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8020
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 pixmap->width = width; pixmap->height = height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8023
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8024 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8025 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8026 /* Depth needs to be divided by 3... but for the RGB colorspace...
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027 * only 8 bits per sample is allowed, so to avoid issues just pass 8 for now.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028 */
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	8029 pixmap->pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, FALSE, 8, width, height );
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	8030 pixmap->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8031 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8035 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 * Creates a pixmap from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8037 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8040 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8042 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8044 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8045 HPIXMAP dw_pixmap_new_from_file(HWND handle, const char *filename)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8047 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8048 HPIXMAP pixmap;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	8049 char *file = alloca(strlen(filename) + 6);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8050 int found_ext = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8051 int i;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8052
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8053 if (!file \|\| !(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8054 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 /* check if we can read from this file (it exists and read permission) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059 if(access(file, 04) != 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061 /* Try with various extentions */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062 for ( i = 0; i < NUM_EXTS; i++ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8063 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064 strcpy( file, filename );
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	8065 strcat( file, _dw_image_exts[i] );
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8066 if ( access( file, 04 ) == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8068 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8070 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8071 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8072 if ( found_ext == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074 free(pixmap);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8076 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8078
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8080 pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	8081 pixmap->image = cairo_image_surface_create_from_png(file);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8082 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8083 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8087 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8088
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8089 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8090 * Creates a pixmap from data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8091 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8093 * data: Source of image data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8094 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8095 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8096 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8099 HPIXMAP dw_pixmap_new_from_data(HWND handle, const char *data, int len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8100 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8101 int fd, written = -1, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8102 HPIXMAP pixmap;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8103 char template[] = "/tmp/dwpixmapXXXXXX";
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8104
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8105 if(!data \|\| !(pixmap = calloc(1,sizeof(struct _hpixmap))))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8107
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8112 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8113 if((fd = mkstemp(template)) != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8114 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8115 written = write(fd, data, len);
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8116 close(fd);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8118 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8119 if(fd == -1 \|\| written != len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8121 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8124 pixmap->pixbuf = gdk_pixbuf_new_from_file(template, NULL);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8125 pixmap->image = cairo_image_surface_create_from_png(template);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8126 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8127 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 /* remove our temporary file */
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8129 unlink(template);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8130 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8132 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136 * Sets the transparent color for a pixmap
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8138 * pixmap: Handle to a pixmap returned by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8139 * dw_pixmap_new..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8140 * color: transparent color
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8141 * Note: This does nothing on GTK+ as transparency
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8142 * is handled automatically
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8143 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8144 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8145 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 * Creates a pixmap from internal resource graphic specified by id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8150 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8151 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 * id: Resource ID associated with requested pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8153 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8154 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8156 HPIXMAP dw_pixmap_grab(HWND handle, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8157 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8158 HPIXMAP pixmap;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8159 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8161 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8162 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	8166 pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8167 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8169 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8170
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8171 static void _dw_flush_dirty(gpointer widget, gpointer data)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8172 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8173 if(widget && GTK_IS_WIDGET(widget))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8174 gtk_widget_queue_draw(GTK_WIDGET(widget));
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8175 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8176
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177 /* Call this after drawing to the screen to make sure
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178 * anything you have drawn is visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8179 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8180 void dw_flush(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8182 int _dw_locked_by_me = FALSE;
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8183
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8184 DW_MUTEX_LOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8185 g_list_foreach(_dw_dirty_list, _dw_flush_dirty, NULL);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8186 g_list_free(_dw_dirty_list);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8187 _dw_dirty_list = NULL;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8188 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 /*
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8192 * Sets the font used by a specified pixmap.
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8193 * Normally the pixmap font is obtained from the associated window handle.
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8194 * However this can be used to override that, or for pixmaps with no window.
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8195 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8196 * pixmap: Handle to a pixmap returned by dw_pixmap_new() or
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8197 * passed to the application via a callback.
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8198 * fontname: Name and size of the font in the form "size.fontname"
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8199 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8200 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8201 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8202 int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8203 {
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8204 if(pixmap)
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8205 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8206 char *oldfont = pixmap->font;
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8207
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	8208 pixmap->font = _dw_convert_font(fontname);
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8209
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8210 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8211 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8212 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8213 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8214 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8215 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8216
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8217 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218 * Destroys an allocated pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220 * pixmap: Handle to a pixmap returned by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 * dw_pixmap_new..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8222 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8223 void dw_pixmap_destroy(HPIXMAP pixmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8225 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8226
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8227 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 g_object_unref(G_OBJECT(pixmap->pixbuf));
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8229 cairo_surface_destroy(pixmap->image);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8230 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8231 free(pixmap->font);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8232 free(pixmap);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8233 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8236 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237 * Copies from one item to another.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8238 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8239 * dest: Destination window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 * destp: Destination pixmap. (choose only one).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8241 * xdest: X coordinate of destination.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8242 * ydest: Y coordinate of destination.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8243 * width: Width of area to copy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8244 * height: Height of area to copy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8245 * src: Source window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 * srcp: Source pixmap. (choose only one).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 * xsrc: X coordinate of source.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8248 * ysrc: Y coordinate of source.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 */
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8250 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)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8251 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8252 dw_pixmap_stretch_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, -1, -1);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8253 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8254
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8255 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8256 * Copies from one surface to another allowing for stretching.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8257 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8258 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8259 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8260 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8261 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8262 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8263 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8264 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8265 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8266 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8267 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8268 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8269 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8270 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8271 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8272 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8273 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8274 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8275 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8276 cairo_t *cr = NULL;
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8277 int cached = FALSE;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8278 int retval = DW_ERROR_GENERAL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8279 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8280 GdkDrawingContext *dc = NULL;
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	8281 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8282 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283
1177 c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1161 diff changeset	8284 if((!dest && (!destp \|\| !destp->image)) \|\| (!src && (!srcp \|\| !srcp->image)))
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8285 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8288 if(dest)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8289 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8290 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8291
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8292 if((cr = g_object_get_data(G_OBJECT(dest), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8293 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8294 else if((display && GDK_IS_X11_DISPLAY(display)))
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8295 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8296 GdkWindow *window = gtk_widget_get_window(dest);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8297 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8298 if(!window \|\| !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8299 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8300 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8301 return retval;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8302 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8303 #if GTK_CHECK_VERSION(3,22,0)
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8304 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8305 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8306 cr = gdk_drawing_context_get_cairo_context(dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8307 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8308 cr = gdk_cairo_create(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8309 #endif
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8310 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8311 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8312 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8313 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8314 if(g_list_find(_dw_dirty_list, dest) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8315 _dw_dirty_list = g_list_append(_dw_dirty_list, dest);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8316 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8317 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318 else if(destp)
816 916002e29d4c Implemented dw_pixmap_bitblt() with cairo surfaces instead of pixbufs. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 815 diff changeset	8319 cr = cairo_create(destp->image);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8320
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8321 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8322 {
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8323 double xscale = 1, yscale = 1;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8324
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8325 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8326 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8327 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8328 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8329 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8330 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8331
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332 if(src)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8333 gdk_cairo_set_source_window (cr, gtk_widget_get_window(src), (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8334 else if(srcp)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8335 cairo_set_source_surface (cr, srcp->image, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8336
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8337 cairo_rectangle(cr, xdest / xscale, ydest / yscale, width, height);
959 37f2938ecd72 Fixes for bitblts with clipping and offset on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 900 diff changeset	8338 cairo_fill(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8339 #if GTK_CHECK_VERSION(3,22,0)
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	8340 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	8341 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8342 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8343 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8344 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	8345 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	8346 gdk_window_end_draw_frame(gtk_widget_get_window(dest), dc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8347 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8348 #endif
2358 314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8349 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2355 diff changeset	8350 cairo_destroy(cr);
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8351 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8352 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8353 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8354 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8357 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8358 * Emits a beep.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8359 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8360 * freq: Frequency.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8361 * dur: Duration.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8363 void dw_beep(int freq, int dur)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8364 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	8365 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8366
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 DW_MUTEX_LOCK;
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	8368 gdk_display_beep(gdk_display_get_default());
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8370 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8371
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 void _my_strlwr(char *buf)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8373 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8374 int z, len = strlen(buf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8376 for(z=0;z<len;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8377 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 if(buf[z] >= 'A' && buf[z] <= 'Z')
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8379 buf[z] -= 'A' - 'a';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8380 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8381 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383 /* Open a shared library and return a handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8384 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8385 * name: Base name of the shared library.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8386 * handle: Pointer to a module handle,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387 * will be filled in with the handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8388 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8389 int dw_module_load(const char name, HMOD handle)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8391 int len;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392 char *newname;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	8393 char errorbuf[1025] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8394
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8396 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8397 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8398
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 if((len = strlen(name)) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8400 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8401
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 /* Lenth + "lib" + ".so" + NULL */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8403 newname = malloc(len + 7);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8404
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 if(!newname)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8406 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8407
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8408 sprintf(newname, "lib%s.so", name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8409 _my_strlwr(newname);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8410
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8411 *handle = dlopen(newname, RTLD_NOW);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8412 if(*handle == NULL)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8413 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8414 strncpy(errorbuf, dlerror(), 1024);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8415 printf("%s\n", errorbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8416 sprintf(newname, "lib%s.so", name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8417 *handle = dlopen(newname, RTLD_NOW);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8418 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8419
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8420 free(newname);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8421
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8422 return (NULL == *handle) ? -1 : 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8423 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8424
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8425 /* Queries the address of a symbol within open handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8426 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8427 * handle: Module handle returned by dw_module_load()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8428 * name: Name of the symbol you want the address of.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8429 * func: A pointer to a function pointer, to obtain
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8430 * the address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8431 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8432 int dw_module_symbol(HMOD handle, const char name, void*func)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8433 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434 if(!func \|\| !name)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8435 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 if(strlen(name) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8438 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8439
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8440 func = (void)dlsym(handle, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 return (NULL == *func);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8442 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8444 /* Frees the shared library previously opened.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8445 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8446 * handle: Module handle returned by dw_module_load()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8447 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 int dw_module_close(HMOD handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 if(handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8451 return dlclose(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8453 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8454
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8456 * Returns the handle to an unnamed mutex semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8457 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8458 HMTX dw_mutex_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8459 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8460 HMTX mutex = malloc(sizeof(pthread_mutex_t));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8461
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462 pthread_mutex_init(mutex, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 return mutex;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8464 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8465
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 * Closes a semaphore created by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8468 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8469 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8470 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471 void dw_mutex_close(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473 if(mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8474 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8475 pthread_mutex_destroy(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8476 free(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8477 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8478 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8479
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8480 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8481 * Tries to gain access to the semaphore, if it can't it blocks.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8482 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8483 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8484 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8485 void dw_mutex_lock(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8486 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8487 /* If we are being called from an event handler we must release
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 * the GTK mutex so we don't deadlock.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8489 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 if(pthread_self() == _dw_thread)
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	8491 _dw_gdk_threads_leave();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8493 pthread_mutex_lock(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8495 /* And of course relock it when we have acquired the mutext */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8496 if(pthread_self() == _dw_thread)
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	8497 _dw_gdk_threads_enter();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8498 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8501 * Tries to gain access to the semaphore.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8502 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8503 * mutex: The handle to the mutex returned by dw_mutex_new().
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8504 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8505 * DW_ERROR_NONE on success, DW_ERROR_TIMEOUT if it is already locked.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8506 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8507 int API dw_mutex_trylock(HMTX mutex)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8508 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8509 if(pthread_mutex_trylock(mutex) == 0)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8510 return DW_ERROR_NONE;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8511 return DW_ERROR_TIMEOUT;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8512 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8513
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8514 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 * Reliquishes the access to the semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8516 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8519 void dw_mutex_unlock(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8520 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8521 pthread_mutex_unlock(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8522 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8524 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8525 * Returns the handle to an unnamed event semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8526 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8527 HEV dw_event_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8529 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 if(!eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8532 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8533
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534 /* We need to be careful here, mutexes on Linux are
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535 * FAST by default but are error checking on other
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 * systems such as FreeBSD and OS/2, perhaps others.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8537 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8538 pthread_mutex_init (&(eve->mutex), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8539 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8540 pthread_cond_init (&(eve->event), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8541
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8542 pthread_mutex_unlock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8543 eve->alive = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8544 eve->posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8545
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8546 return eve;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8547 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8548
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8549 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8550 * Resets a semaphore created by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8551 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8552 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8553 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554 int dw_event_reset (HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8555 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556 if(!eve)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8557 return DW_ERROR_NON_INIT;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8560 pthread_cond_broadcast (&(eve->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 pthread_cond_init (&(eve->event), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8562 eve->posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563 pthread_mutex_unlock (&(eve->mutex));
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8564 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8565 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8566
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8567 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8568 * Posts a semaphore created by dw_event_new(). Causing all threads
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 * waiting on this event in dw_event_wait to continue.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8570 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8571 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8572 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8573 int dw_event_post (HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8574 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8575 if(!eve)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8576 return DW_ERROR_NON_INIT;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8577
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8578 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8579 pthread_cond_broadcast (&(eve->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8580 eve->posted = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8581 pthread_mutex_unlock (&(eve->mutex));
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8582 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8584
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586 * Waits on a semaphore created by dw_event_new(), until the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8587 * event gets posted or until the timeout expires.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8589 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8590 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8591 int dw_event_wait(HEV eve, unsigned long timeout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8592 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 int rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 if(!eve)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8596 return DW_ERROR_NON_INIT;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8597
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8598 pthread_mutex_lock (&(eve->mutex));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8599
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8600 if(eve->posted)
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8601 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8602 pthread_mutex_unlock (&(eve->mutex));
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8603 return DW_ERROR_NONE;
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8604 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8605
1156 03b6d9fdfac0 Fixed a typo on Unix... timeout not time. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	8606 if(timeout != -1)
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8607 {
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8608 struct timeval now;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8609 struct timespec timeo;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8610
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8611 gettimeofday(&now, 0);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8612 timeo.tv_sec = now.tv_sec + (timeout / 1000);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8613 timeo.tv_nsec = now.tv_usec * 1000;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8614 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8615 }
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8616 else
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8617 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8618
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8619 pthread_mutex_unlock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8620 if(!rc)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8621 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 if(rc == ETIMEDOUT)
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8623 return DW_ERROR_TIMEOUT;
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8624 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8625 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8626
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8627 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8628 * Closes a semaphore created by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8631 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8632 int dw_event_close(HEV *eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8633 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8634 if(!eve \|\| !(*eve))
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8635 return DW_ERROR_NON_INIT;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8636
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8637 pthread_mutex_lock (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8638 pthread_cond_destroy (&((*eve)->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8639 pthread_mutex_unlock (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8640 pthread_mutex_destroy (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8641 free(*eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8642 *eve = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8643
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	8644 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8645 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8647 struct _dw_seminfo {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8648 int fd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8649 int waiting;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8650 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8651
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8652 static void _dw_handle_sem(int *tmpsock)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8653 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8654 fd_set rd;
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8655 struct _dw_seminfo array = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8656 int listenfd = tmpsock[0];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8657 int bytesread, connectcount = 1, maxfd, z, posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8658 char command;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8659 sigset_t mask;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8660
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8661 sigfillset(&mask); /* Mask all allowed signals */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8662 pthread_sigmask(SIG_BLOCK, &mask, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8663
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8664 /* problems */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8665 if(tmpsock[1] == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8666 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8667 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8668 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8670
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8671 array[0].fd = tmpsock[1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8672 array[0].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8673
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8674 /* Free the memory allocated in dw_named_event_new. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8675 free(tmpsock);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8676
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8677 while(1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8678 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8679 FD_ZERO(&rd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8680 FD_SET(listenfd, &rd);
2159 48172881415c GTK: Add DW_UNUSED() macro for defining variables that may be unused. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2158 diff changeset	8681 int DW_UNUSED(result);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8683 maxfd = listenfd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685 /* Added any connections to the named event semaphore */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8686 for(z=0;z<connectcount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8688 if(array[z].fd > maxfd)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 maxfd = array[z].fd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8690
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8691 FD_SET(array[z].fd, &rd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8694 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8695 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8696 free(array);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8697 return;
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8698 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8700 if(FD_ISSET(listenfd, &rd))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8701 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8702 struct _dw_seminfo *newarray;
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8703 int newfd = accept(listenfd, 0, 0);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8704
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8705 if(newfd > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8706 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 /* Add new connections to the set */
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8708 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount+1));
86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8709 memcpy(newarray, array, sizeof(struct _dw_seminfo)*(connectcount));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8710
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8711 newarray[connectcount].fd = newfd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 newarray[connectcount].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8713
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 connectcount++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8715
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8716 /* Replace old array with new one */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8717 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8718 array = newarray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8719 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8720 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8721
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8722 /* Handle any events posted to the semaphore */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8723 for(z=0;z<connectcount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8725 if(FD_ISSET(array[z].fd, &rd))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8726 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8727 if((bytesread = read(array[z].fd, &command, 1)) < 1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8729 struct _dw_seminfo *newarray;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8730
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8731 /* Remove this connection from the set */
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8732 newarray = (struct _dw_seminfo )malloc(sizeof(struct _dw_seminfo)(connectcount-1));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8733 if(!z)
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8734 memcpy(newarray, &array[1], sizeof(struct _dw_seminfo)*(connectcount-1));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8735 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8736 {
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8737 memcpy(newarray, array, sizeof(struct _dw_seminfo)*z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8738 if(z!=(connectcount-1))
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8739 memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(connectcount-(z+1)));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8741 connectcount--;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8743 /* Replace old array with new one */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8744 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 array = newarray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8746 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8747 else if(bytesread == 1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8748 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8749 switch(command)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8751 case 0:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8752 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8753 /* Reset */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8754 posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8756 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8757 case 1:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8758 /* Post */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8759 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8760 int s;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8761 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8762
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763 posted = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8765 for(s=0;s<connectcount;s++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8767 /* The semaphore has been posted so
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8768 * we tell all the waiting threads to
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8769 * continue.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8770 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771 if(array[s].waiting)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8772 result = write(array[s].fd, &tmp, 1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8773 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 case 2:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8777 /* Wait */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8779 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8780
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781 array[z].waiting = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8782
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783 /* If we are posted exit immeditately */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8784 if(posted)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8785 result = write(array[z].fd, &tmp, 1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8786 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8787 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788 case 3:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8789 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8790 /* Done Waiting */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8791 array[z].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8792 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8793 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8794 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8795 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8797 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8798 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8799 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8800
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 /* Using domain sockets on unix for IPC */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8802 /* Create a named event semaphore which can be
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803 * opened from other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8804 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 * eve: Pointer to an event handle to receive handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806 * name: Name given to semaphore which can be opened
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8807 * by other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8808 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8809 HEV dw_named_event_new(const char *name)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8810 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8811 struct sockaddr_un un;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8812 int ev, tmpsock = (int )malloc(sizeof(int)*2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8813 DWTID dwthread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8814
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8815 if(!tmpsock)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8816 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8818 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8819 ev = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8820 memset(&un, 0, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8821 un.sun_family=AF_UNIX;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8822 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8823 strcpy(un.sun_path, "/tmp/.dw/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8824 strcat(un.sun_path, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8826 /* just to be safe, this should be changed
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8827 * to support multiple instances.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8828 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8829 remove(un.sun_path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8830
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8831 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8832 listen(tmpsock[0], 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8833 connect(ev, (struct sockaddr *)&un, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8834 tmpsock[1] = accept(tmpsock[0], 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8836 if(tmpsock[0] < 0 \|\| tmpsock[1] < 0 \|\| ev < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8837 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8838 if(tmpsock[0] > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8839 close(tmpsock[0]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8840 if(tmpsock[1] > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8841 close(tmpsock[1]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8842 if(ev > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8843 close(ev);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 free(tmpsock);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8845 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8846 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8847
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 /* Create a thread to handle this event semaphore */
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8849 pthread_create(&dwthread, NULL, (void )_dw_handle_sem, (void )tmpsock);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8850 return GINT_TO_POINTER(ev);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8851 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8852
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 /* Open an already existing named event semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855 * eve: Pointer to an event handle to receive handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8856 * name: Name given to semaphore which can be opened
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 * by other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8858 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8859 HEV dw_named_event_get(const char *name)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8860 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8861 struct sockaddr_un un;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8862 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8863 if(ev < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8864 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8865
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8866 un.sun_family=AF_UNIX;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8867 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8868 strcpy(un.sun_path, "/tmp/.dw/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8869 strcat(un.sun_path, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8870 connect(ev, (struct sockaddr *)&un, sizeof(un));
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8871 return GINT_TO_POINTER(ev);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8872 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8873
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8874 /* Resets the event semaphore so threads who call wait
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8875 * on this semaphore will block.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8876 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8877 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8878 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8879 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8880 int dw_named_event_reset(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8881 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8882 /* signal reset */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8883 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8884
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8885 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8886 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8887
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8888 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8889 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8890 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8891 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8892
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8893 /* Sets the posted state of an event semaphore, any threads
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8894 * waiting on the semaphore will no longer block.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8895 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8896 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8897 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8898 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8899 int dw_named_event_post(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8900 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8901
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8902 /* signal post */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8903 char tmp = (char)1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8904
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8905 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8906 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8907
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8908 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8909 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8910 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8911 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8912
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913 /* Waits on the specified semaphore until it becomes
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8914 * posted, or returns immediately if it already is posted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8915 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8916 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8917 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8918 * timeout: Number of milliseconds before timing out
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8919 * or -1 if indefinite.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8920 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8921 int dw_named_event_wait(HEV eve, unsigned long timeout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8922 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8923 fd_set rd;
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8924 struct timeval tv, *useme = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8925 int retval = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8926 char tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8927
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8928 if(GPOINTER_TO_INT(eve) < 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8929 return DW_ERROR_NON_INIT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8931 /* Set the timout or infinite */
1155 e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1152 diff changeset	8932 if(timeout != -1)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8933 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8934 tv.tv_sec = timeout / 1000;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8935 tv.tv_usec = timeout % 1000;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8936
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8937 useme = &tv;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8938 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8939
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8940 FD_ZERO(&rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8941 FD_SET(GPOINTER_TO_INT(eve), &rd);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8942
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8943 /* Signal wait */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8944 tmp = (char)2;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8945 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8946
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8947 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8948 retval = select(GPOINTER_TO_INT(eve)+1, &rd, NULL, NULL, useme);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8949
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8950 /* Signal done waiting. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8951 tmp = (char)3;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8952 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8953 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8954
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8955 if(retval == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8956 return DW_ERROR_TIMEOUT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8957 else if(retval == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8958 return DW_ERROR_INTERRUPT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8959
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8960 /* Clear the entry from the pipe so
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8961 * we don't loop endlessly. :)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8962 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8963 if(read(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8964 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8965 return DW_ERROR_GENERAL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8966 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8967
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8968 /* Release this semaphore, if there are no more open
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8969 * handles on this semaphore the semaphore will be destroyed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8970 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8971 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8972 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8973 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8974 int dw_named_event_close(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8975 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8976 /* Finally close the domain socket,
2855 86286f528adf Fix new safety warnings reported by the new GCC on Linux. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2854 diff changeset	8977 * cleanup will continue in _dw_handle_sem.
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8978 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8979 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8980 return DW_ERROR_NONE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8981 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8982
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8983 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8984 * Generally an internal function called from a newly created
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8985 * thread to setup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8986 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8987 * they create threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8988 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8989 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8990 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8991 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8992
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8993 foreground->alpha = foreground->red = foreground->green = foreground->blue = 0.0;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8994 pthread_setspecific(_dw_fg_color_key, foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8995 pthread_setspecific(_dw_bg_color_key, NULL);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8996 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8997
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8998 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8999 * Generally an internal function called from a terminating
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9000 * thread to cleanup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9001 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9002 * they exit threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9003 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9004 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9005 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9006 GdkRGBA foreground, background;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9007
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9008 if((foreground = pthread_getspecific(_dw_fg_color_key)))
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9009 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9010 if((background = pthread_getspecific(_dw_bg_color_key)))
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9011 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9012 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9013
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9014 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9015 * Setup thread independent color sets.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9016 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9017 void _dwthreadstart(void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9018 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9019 void (threadfunc)(void ) = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9020 void tmp = (void )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9022 threadfunc = (void ()(void ))tmp[0];
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9023
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	9024 /* Initialize colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9025 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9026
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9027 threadfunc(tmp[1]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9028 free(tmp);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9029
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	9030 /* Free colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	9031 _dw_deinit_thread();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9032 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9034 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9035 * Allocates a shared memory region with a name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9036 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9037 * handle: A pointer to receive a SHM identifier.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9038 * dest: A pointer to a pointer to receive the memory address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9039 * size: Size in bytes of the shared memory region to allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9040 * name: A string pointer to a unique memory name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9041 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	9042 HSHM dw_named_memory_new(void *dest, int size, const char name)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9043 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	9044 char namebuf[1025];
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9045 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9046
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9047 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	9048 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9049
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9050 if((handle->fd = open(namebuf, O_CREAT \| O_RDWR, S_IRUSR \| S_IWUSR)) < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9051 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9052 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9053 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9054 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9055
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9056 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9057 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9058 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9059 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9060 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	9061 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9062
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9063 /* attach the shared memory segment to our process's address space. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9064 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9065
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9066 if(*dest == MAP_FAILED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9067 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9068 close(handle->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9069 *dest = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9070 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9071 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9072 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9074 handle->size = size;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9075 handle->sid = getsid(0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9076 handle->path = strdup(namebuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9077
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9078 return handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9079 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9080
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9081 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9082 * Aquires shared memory region with a name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9083 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9084 * dest: A pointer to a pointer to receive the memory address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9085 * size: Size in bytes of the shared memory region to requested.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9086 * name: A string pointer to a unique memory name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9087 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	9088 HSHM dw_named_memory_get(void *dest, int size, const char name)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9089 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	9090 char namebuf[1025];
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9091 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9092
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9093 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	9094 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9096 if((handle->fd = open(namebuf, O_RDWR)) < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9097 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9098 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9099 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9100 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9101
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9102 /* attach the shared memory segment to our process's address space. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9103 *dest = mmap(NULL, size, PROT_READ \| PROT_WRITE, MAP_SHARED, handle->fd, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9104
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9105 if(*dest == MAP_FAILED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9106 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9107 close(handle->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9108 *dest = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9109 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9110 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9111 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9112
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9113 handle->size = size;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9114 handle->sid = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9115 handle->path = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9116
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9117 return handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9118 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9119
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9120 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9121 * Frees a shared memory region previously allocated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9122 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9123 * handle: Handle obtained from DB_named_memory_allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9124 * ptr: The memory address aquired with DB_named_memory_allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9125 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9126 int dw_named_memory_free(HSHM handle, void *ptr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9127 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9128 struct _dw_unix_shm *h = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9129 int rc = munmap(ptr, h->size);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9130
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9131 close(h->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9132 if(h->path)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9133 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9134 /* Only remove the actual file if we are the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9135 * creator of the file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9136 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9137 if(h->sid != -1 && h->sid == getsid(0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9138 remove(h->path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9139 free(h->path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9140 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9141 return rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9142 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9143 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9144 * Creates a new thread with a starting point of func.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9145 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9146 * func: Function which will be run in the new thread.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9147 * data: Parameter(s) passed to the function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9148 * stack: Stack size of new thread (OS/2 and Windows only).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9149 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9150 DWTID dw_thread_new(void func, void data, int stack)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9151 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9152 DWTID gtkthread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9153 void *tmp = malloc(sizeof(void ) * 2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9154 int rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9155
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9156 tmp[0] = func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9157 tmp[1] = data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9159 rc = pthread_create(&gtkthread, NULL, (void )_dwthreadstart, (void )tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9160 if ( rc == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9161 return gtkthread;
1894 ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1892 diff changeset	9162 return (DWTID)DW_ERROR_UNKNOWN;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9163 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9165 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9166 * Ends execution of current thread immediately.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9167 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9168 void dw_thread_end(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9169 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9170 pthread_exit(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9171 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9172
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9173 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9174 * Returns the current thread's ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9175 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9176 DWTID dw_thread_id(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9177 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9178 return (DWTID)pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9179 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9180
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9181 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9182 * Cleanly terminates a DW session, should be signal handler safe.
1861 c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9183 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9184 void dw_shutdown(void)
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9185 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9186 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9187
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9188 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9189 * Cleanly terminates a DW session, should be signal handler safe.
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9190 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9191 * exitcode: Exit code reported to the operating system.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9192 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9193 void dw_exit(int exitcode)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9194 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9195 exit(exitcode);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9196 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9197
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9198 /* Internal function to get the recommended size of scrolled items */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9199 void _dw_get_scrolled_size(GtkWidget item, gint thiswidth, gint *thisheight)
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9200 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9201 GtkWidget *widget = g_object_get_data(G_OBJECT(item), "_dw_user");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9202
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9203 thisheight = thiswidth = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9204
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9205 if(widget)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9206 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9207 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9208 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	9209 /* Set to half for tree */
035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	9210 *thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	9211 *thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9212 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9213 else if(GTK_IS_TEXT_VIEW(widget))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9214 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9215 unsigned long bytes;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9216 int height, width;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9217 char buf, ptr;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9218 int wrap = (gtk_text_view_get_wrap_mode(GTK_TEXT_VIEW(widget)) == GTK_WRAP_WORD);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9219 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9220 int hscrolled = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9221
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9222 thiswidth = thisheight = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9223
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9224 dw_mle_get_size(item, &bytes, NULL);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9225
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9226 ptr = buf = alloca(bytes + 2);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9227 dw_mle_export(item, buf, 0, (int)bytes);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9228 buf[bytes] = 0;
1562 9a8aa230a538 Ported a couple fixes from GTK3 to GTK2 that I had missed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1561 diff changeset	9229 strcat(buf, "\r");
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9230
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9231 /* MLE */
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9232 while((ptr = strstr(buf, "\r")))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9233 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9234 ptr[0] = 0;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9235 width = 0;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9236 if(strlen(buf))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9237 dw_font_text_extents_get(item, NULL, buf, &width, &height);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9238 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9239 dw_font_text_extents_get(item, NULL, testtext, NULL, &height);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9240
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9241 if(wrap && width > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9242 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9243 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9244 thisheight += height (width / _DW_SCROLLED_MAX_WIDTH);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9245 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9246 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9247 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9248 if(width > *thiswidth)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9249 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9250 if(width > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9251 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9252 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9253 hscrolled = TRUE;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9254 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9255 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9256 *thiswidth = width;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9257 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9258 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9259 *thisheight += height;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9260 if(ptr[1] == '\n')
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9261 buf = &ptr[2];
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9262 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9263 buf = &ptr[1];
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9264 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9265 if(hscrolled)
1563 90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1562 diff changeset	9266 *thisheight += 10;
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9267 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9268 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9269 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9270 gtk_widget_get_preferred_height(GTK_WIDGET(widget), NULL, thisheight);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9271 gtk_widget_get_preferred_width(GTK_WIDGET(widget), NULL, thiswidth);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9272
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9273 *thisheight += 20;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9274 *thiswidth += 20;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9275 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9276 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9277 if(*thiswidth < _DW_SCROLLED_MIN_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9278 *thiswidth = _DW_SCROLLED_MIN_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9279 if(*thiswidth > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9280 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9281 if(*thisheight < _DW_SCROLLED_MIN_HEIGHT)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9282 *thisheight = _DW_SCROLLED_MIN_HEIGHT;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9283 if(*thisheight > _DW_SCROLLED_MAX_HEIGHT)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9284 *thisheight = _DW_SCROLLED_MAX_HEIGHT;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9285 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9286
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9287 /* Internal box packing function called by the other 3 functions */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9288 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9289 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9290 int warn = FALSE, _dw_locked_by_me = FALSE;
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9291 GtkWidget tmp, tmpitem, *image = NULL;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9292
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9293 if(!box)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9294 return;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9295
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9296 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9297 * If you try and pack an item into itself VERY bad things can happen; like at least an
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9298 * infinite loop on GTK! Lets be safe!
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9299 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9300 if(box == item)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9301 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9302 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9303 return;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9304 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9305
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9306 DW_MUTEX_LOCK;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9307
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9308 /* If this is a special box, like: Window, Groupbox, Scrollbox...
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9309 * get the internal box handle.
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9310 */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9311 if((tmp = g_object_get_data(G_OBJECT(box), "_dw_boxhandle")))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9312 box = tmp;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9313
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9314 /* Can't pack nothing with GTK, so create an empty label */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9315 if(!item)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9316 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9317 item = gtk_label_new("");
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9318 g_object_set_data(G_OBJECT(item), "_dw_padding", GINT_TO_POINTER(1));
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9319 gtk_widget_show_all(item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9320 }
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9321 /* Due to GTK3 minimum size limitations, if we are packing a widget
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9322 * with an image, we need to scale the image down to fit the packed size.
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9323 */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9324 else if((image = g_object_get_data(G_OBJECT(item), "_dw_bitmap")))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9325 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9326 GdkPixbuf *pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image));
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9327
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9328 if(pixbuf)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9329 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9330 int pwidth = gdk_pixbuf_get_width(pixbuf);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9331 int pheight = gdk_pixbuf_get_height(pixbuf);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9332
1426 dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	9333 if(width == -1)
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	9334 width = pwidth;
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	9335 if(height == -1)
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	9336 height = pheight;
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9337
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9338 if(pwidth > width \|\| pheight > height)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9339 pixbuf = gdk_pixbuf_scale_simple(pixbuf, pwidth > width ? width : pwidth, pheight > height ? height : pheight, GDK_INTERP_BILINEAR);
1426 dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	9340 gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9341 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9342 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9343
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9344 /* Check if the item to be packed is a special box */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9345 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9346
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9347 /* Make sure our target box is valid */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9348 if(GTK_IS_GRID(box))
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9349 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	9350 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	9351 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9352
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9353 /* If the item being packed is a box, then we use it's padding
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9354 * instead of the padding specified on the pack line, this is
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9355 * due to a bug in the OS/2 and Win32 renderer and a limitation
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9356 * of the GtkTable class.
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9357 */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9358 if(GTK_IS_GRID(item) \|\| (tmpitem && GTK_IS_GRID(tmpitem)))
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9359 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9360 GtkWidget eventbox = (GtkWidget )g_object_get_data(G_OBJECT(item), "_dw_eventbox");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9361
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9362 /* NOTE: I left in the ability to pack boxes with a size,
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9363 * this eliminates that by forcing the size to 0.
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9364 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9365 height = width = 0;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9366
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9367 if(eventbox)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9368 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	9369 int boxpad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "_dw_boxpad"));
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9370 gtk_container_add(GTK_CONTAINER(eventbox), item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9371 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9372 item = eventbox;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9373 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9374 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9375 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9376 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9377 /* Only show warning if item is not a box */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9378 warn = TRUE;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9379 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9380
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9381 /* Do some sanity bounds checking */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9382 if(index < 0)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9383 index = 0;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9384 if(index > boxcount)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9385 index = boxcount;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9386
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9387 #if !GTK_CHECK_VERSION(3,10,0)
1656 01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9388 /* Fix the index by taking into account empty cells */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9389 if(boxtype == DW_VERT)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9390 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9391 int z;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9392
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9393 for(z=0;z<index;z++)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9394 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9395 if(!gtk_grid_get_child_at(GTK_GRID(box), 0, z))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9396 index++;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9397 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9398 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9399 else
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9400 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9401 int z;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9402
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9403 for(z=0;z<index;z++)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9404 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9405 if(!gtk_grid_get_child_at(GTK_GRID(box), z, 0))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9406 index++;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9407 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9408 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9409 #endif
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9410
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9411 g_object_set_data(G_OBJECT(item), "_dw_table", box);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9412 /* Set the expand attribute on the widgets now instead of the container */
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9413 gtk_widget_set_vexpand(item, vsize);
1127 ed7cbdc37a75 Widget GTK3 v/halign properties get set according to the sizing flags bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1126 diff changeset	9414 gtk_widget_set_valign(item, vsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9415 gtk_widget_set_hexpand(item, hsize);
1127 ed7cbdc37a75 Widget GTK3 v/halign properties get set according to the sizing flags bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1126 diff changeset	9416 gtk_widget_set_halign(item, hsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9417 /* Use the margin property as padding */
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9418 g_object_set(G_OBJECT(item), "margin", pad, NULL);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9419 /* Add to the grid using insert...
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9420 * rows for vertical boxes and columns for horizontal.
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9421 */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9422 if(boxtype == DW_VERT)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9423 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9424 gtk_grid_insert_row(GTK_GRID(box), index);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9425 gtk_grid_attach(GTK_GRID(box), item, 0, index, 1, 1);
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9426 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9427 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9428 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9429 gtk_grid_insert_column(GTK_GRID(box), index);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9430 gtk_grid_attach(GTK_GRID(box), item, index, 0, 1, 1);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9431 }
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9432 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9433 /* Special case for scrolled windows */
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9434 if(GTK_IS_SCROLLED_WINDOW(item))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9435 {
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9436 gint scrolledwidth = 0, scrolledheight = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9437
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9438 /* Pre-run the calculation code for MLE/Container/Tree if needed */
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9439 if((width < 1 && !hsize) \|\| (height < 1 && !vsize))
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9440 _dw_get_scrolled_size(item, &scrolledwidth, &scrolledheight);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9441
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9442 if(width > 0)
28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9443 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
1539 b7136c130a66 Default scrolled items to 500x200 on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1528 diff changeset	9444 else if(!hsize)
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9445 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), scrolledwidth);
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9446 if(height > 0)
28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9447 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
1539 b7136c130a66 Default scrolled items to 500x200 on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1528 diff changeset	9448 else if(!vsize)
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9449 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), scrolledheight);
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9450 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9451 else
1414 38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9452 {
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9453 /* Set the requested size of the widget */
1414 38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9454 if(width == -1 && (GTK_IS_COMBO_BOX(item) \|\| GTK_IS_ENTRY(item)))
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9455 gtk_widget_set_size_request(item, 150, height);
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9456 else if(width == -1 && GTK_IS_SPIN_BUTTON(item))
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9457 gtk_widget_set_size_request(item, 50, height);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9458 else
1414 38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9459 gtk_widget_set_size_request(item, width, height);
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9460 }
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9461 if(GTK_IS_RADIO_BUTTON(item))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9462 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9463 GSList *group;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9464 GtkWidget groupstart = (GtkWidget )g_object_get_data(G_OBJECT(box), "_dw_group");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9465
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9466 if(groupstart)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9467 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9468 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(groupstart));
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9469 gtk_radio_button_set_group(GTK_RADIO_BUTTON(item), group);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9470 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9471 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9472 g_object_set_data(G_OBJECT(box), "_dw_group", (gpointer)item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9473 }
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9474 /* If we previously incremented the reference count... drop it now that it is packed */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9475 if(g_object_get_data(G_OBJECT(item), "_dw_refed"))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9476 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9477 g_object_unref(G_OBJECT(item));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9478 g_object_set_data(G_OBJECT(item), "_dw_refed", NULL);
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9479 }
1080 27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9480 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9481 DW_MUTEX_UNLOCK;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9482
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9483 if(warn)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9484 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9485 if ( width == 0 && hsize == FALSE )
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9486 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9487 if ( height == 0 && vsize == FALSE )
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9488 dw_messagebox(funcname, DW_MB_OK\|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9489 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9490 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9491
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9492 /*
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9493 * Remove windows (widgets) from the box they are packed into.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9494 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9495 * handle: Window handle of the packed item to be removed.
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9496 * Returns:
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9497 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9498 */
1769 d81bebc5c8cc Mark and I decided to change dw_box_remove() to dw_box_unpack() for consistency. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1747 diff changeset	9499 int API dw_box_unpack(HWND handle)
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9500 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9501 int _dw_locked_by_me = FALSE, retcode = DW_ERROR_GENERAL;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9502
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9503 DW_MUTEX_LOCK;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9504 if(GTK_IS_WIDGET(handle))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9505 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9506 GtkWidget box, handle2 = handle;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9507 GtkWidget eventbox = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9508
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9509 /* Handle the invisible event box if it exists */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9510 if(eventbox && GTK_IS_WIDGET(eventbox))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9511 handle2 = eventbox;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9512
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9513 /* Check if we are removing a widget from a box */
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9514 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9515 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9516 /* Get the number of items in the box... */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9517 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9518 #if GTK_CHECK_VERSION(3,10,0)
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9519 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9520 #endif
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9521
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9522 if(boxcount > 0)
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9523 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9524 /* Decrease the count by 1 */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9525 boxcount--;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9526 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9527 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9528 /* If we haven't incremented the reference count... raise it before removal */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9529 if(!g_object_get_data(G_OBJECT(handle2), "_dw_refed"))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9530 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9531 g_object_ref(G_OBJECT(handle2));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9532 g_object_set_data(G_OBJECT(handle2), "_dw_refed", GINT_TO_POINTER(1));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9533 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9534 /* Remove the widget from the box */
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9535 #if GTK_CHECK_VERSION(3,10,0)
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9536 /* Figure out where in the grid this widget is and remove that row/column */
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9537 if(boxtype == DW_VERT)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9538 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9539 int z;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9540
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9541 for(z=0;z<boxcount;z++)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9542 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9543 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9544 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9545 gtk_grid_remove_row(GTK_GRID(box), z);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9546 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9547 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9548 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9549 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9550 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9551 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9552 int z;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9553
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9554 for(z=0;z<boxcount;z++)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9555 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9556 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9557 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9558 gtk_grid_remove_column(GTK_GRID(box), z);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9559 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9560 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9561 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9562 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9563 #else
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9564 gtk_container_remove(GTK_CONTAINER(box), handle2);
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9565 #endif
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9566 retcode = DW_ERROR_NONE;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9567 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9568 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9569 DW_MUTEX_UNLOCK;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9570 return retcode;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9571 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9572
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9573 /*
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9574 * Remove windows (widgets) from a box at an arbitrary location.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9575 * Parameters:
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9576 * box: Window handle of the box to be removed from.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9577 * index: 0 based index of packed items.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9578 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9579 * Handle to the removed item on success, 0 on failure or padding.
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9580 */
1769 d81bebc5c8cc Mark and I decided to change dw_box_remove() to dw_box_unpack() for consistency. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1747 diff changeset	9581 HWND API dw_box_unpack_at_index(HWND box, int index)
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9582 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9583 int _dw_locked_by_me = FALSE;
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9584 HWND retval = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9585
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9586 DW_MUTEX_LOCK;
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9587 /* Check if we are removing a widget from a box */
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9588 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9589 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9590 /* Get the number of items in the box... */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9591 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9592 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9593 #if GTK_CHECK_VERSION(3,10,0)
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9594 GtkWidget *item = (boxtype == DW_VERT) ? gtk_grid_get_child_at(GTK_GRID(box), 0, index) : gtk_grid_get_child_at(GTK_GRID(box), index, 0);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9595 #else
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9596 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9597
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9598 /* Fix the index by taking into account empty cells */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9599 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9600 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9601 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9602
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9603 for(z=0;z<index;z++)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9604 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9605 if(!gtk_grid_get_child_at(GTK_GRID(box), 0, z))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9606 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9607 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9608 item = gtk_grid_get_child_at(GTK_GRID(box), 0, index);
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9609 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9610 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9611 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9612 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9613
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9614 for(z=0;z<index;z++)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9615 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9616 if(!gtk_grid_get_child_at(GTK_GRID(box), z, 0))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9617 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9618 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9619 item = gtk_grid_get_child_at(GTK_GRID(box), index, 0);
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9620 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9621 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9622
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9623 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9624 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9625 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9626 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9627 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9628 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9629 /* If we haven't incremented the reference count... raise it before removal */
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9630 if(item && g_object_get_data(G_OBJECT(item), "_dw_padding"))
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9631 gtk_widget_destroy(item);
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9632 else if(item)
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9633 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9634 if(!g_object_get_data(G_OBJECT(item), "_dw_refed"))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9635 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9636 g_object_ref(G_OBJECT(item));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9637 g_object_set_data(G_OBJECT(item), "_dw_refed", GINT_TO_POINTER(1));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9638 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9639 /* Remove the widget from the box */
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9640 gtk_container_remove(GTK_CONTAINER(box), item);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9641 #if GTK_CHECK_VERSION(3,10,0)
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9642 if(boxtype == DW_VERT)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9643 gtk_grid_remove_row(GTK_GRID(box), index);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9644 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9645 gtk_grid_remove_column(GTK_GRID(box), index);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9646 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9647 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9648 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9649 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9650 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9651 return retval;
1669 36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9652 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9653
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9654 /*
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9655 * Pack windows (widgets) into a box at an arbitrary location.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9656 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9657 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1674 diff changeset	9658 * item: Window handle of the item to pack.
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9659 * index: 0 based index of packed items.
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9660 * width: Width in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9661 * height: Height in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9662 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9663 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9664 * pad: Number of pixels of padding around the item.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9665 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9666 void API dw_box_pack_at_index(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9667 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9668 _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9669 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9670
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9671 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9672 * Pack windows (widgets) into a box from the start (or top).
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9673 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9674 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1674 diff changeset	9675 * item: Window handle of the item to pack.
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9676 * width: Width in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9677 * height: Height in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9678 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9679 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9680 * pad: Number of pixels of padding around the item.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9681 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9682 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9683 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9684 /* 65536 is the table limit on GTK...
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9685 * seems like a high enough value we will never hit it here either.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9686 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9687 _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9688 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9689
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9690 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9691 * Pack windows (widgets) into a box from the end (or bottom).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9692 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9693 * box: Window handle of the box to be packed into.
1678 896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1674 diff changeset	9694 * item: Window handle of the item to pack.
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9695 * width: Width in pixels of the item or -1 to be self determined.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9696 * height: Height in pixels of the item or -1 to be self determined.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9697 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9698 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9699 * pad: Number of pixels of padding around the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9700 */
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9701 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9702 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9703 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9704 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9705
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9706
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9707 union _dw_extents_union { guchar gu_extents; unsigned long extents; };
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9708 static GdkAtom _dw_extents_atom = 0;
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9709 static time_t _dw_extents_time = 0;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9710
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9711 static gboolean _dw_property_notify(GtkWidget window, GdkEventProperty event, GdkWindow *gdkwindow)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9712 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9713 /* Check to see if we got a property change */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9714 if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == _dw_extents_atom && event->window == gdkwindow)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9715 _dw_extents_time = 0;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9716 return FALSE;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9717 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9718
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9719 /* Internal function to figure out the frame extents of an unmapped window */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9720 void _dw_get_frame_extents(GtkWidget window, int vert, int *horz)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9721 {
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9722 if(gtk_window_get_decorated(GTK_WINDOW(window)))
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9723 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9724 const char *request = "_NET_REQUEST_FRAME_EXTENTS";
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9725 unsigned long *extents = NULL;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9726 union _dw_extents_union eu;
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9727 GdkAtom request_extents = gdk_atom_intern(request, FALSE);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9728 GdkWindow *gdkwindow = gtk_widget_get_window(window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9729 GdkDisplay *display = gtk_widget_get_display(window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9730
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9731 if(!_dw_extents_atom)
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9732 _dw_extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9733
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9734 /* Set some rational defaults.. just in case */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9735 *vert = 28;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9736 *horz = 12;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9737
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9738 /* See if the current window manager supports _NET_REQUEST_FRAME_EXTENTS */
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	9739 if(display && GDK_IS_X11_DISPLAY(display) && gdk_x11_screen_supports_net_wm_hint(gdk_screen_get_default(), request_extents))
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9740 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9741 Display *xdisplay = GDK_DISPLAY_XDISPLAY(display);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9742 GdkWindow *root_window = gdk_get_default_root_window();
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9743 Window xroot_window = GDK_WINDOW_XID(root_window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9744 Atom extents_request_atom = gdk_x11_get_xatom_by_name_for_display(display, request);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9745 unsigned long window_id = GDK_WINDOW_XID(gdkwindow);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9746 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9747 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9748 gulong connid;
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9749
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9750 xevent.xclient.type = ClientMessage;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9751 xevent.xclient.message_type = extents_request_atom;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9752 xevent.xclient.display = xdisplay;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9753 xevent.xclient.window = window_id;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9754 xevent.xclient.format = 32;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9755
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9756 /* Send the property request */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9757 XSendEvent(xdisplay, xroot_window, False,
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9758 (SubstructureRedirectMask \| SubstructureNotifyMask),
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9759 &xevent);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9760
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9761 /* Connect a signal to look for the property change */
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9762 connid = g_signal_connect(G_OBJECT(window), "property_notify_event", G_CALLBACK(_dw_property_notify), gdkwindow);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9763
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9764 /* Record the request time */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9765 time(&_dw_extents_time);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9766
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9767 /* Look for the property notify event */
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9768 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9769 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9770 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9771 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9772 }
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9773 while(currtime - _dw_extents_time < 2);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9774
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9775 /* Remove the signal handler now that we are done */
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9776 g_signal_handler_disconnect(G_OBJECT(window), connid);
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9777 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9778
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9779 /* Attempt to retrieve window's frame extents. */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9780 eu.extents = &extents;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9781 if(gdk_property_get(gdkwindow,
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9782 _dw_extents_atom,
1482 dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9783 gdk_atom_intern("CARDINAL", FALSE),
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9784 0, sizeof(unsigned long)*4, FALSE,
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9785 NULL, NULL, NULL, eu.gu_extents))
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9786 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9787 *horz = extents[0] + extents[1];
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9788 *vert = extents[2] + extents[3];
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9789 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9790 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9791 else
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9792 horz = vert = 0;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9793 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9794
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9795 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796 * Sets the size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9797 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9798 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9799 * width: New width in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9800 * height: New height in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9801 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802 void dw_window_set_size(HWND handle, unsigned long width, unsigned long height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9803 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9804 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9805
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9806 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9807 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9809 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9810 if(GTK_IS_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9811 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9812 GdkWindow *window = gtk_widget_get_window(handle);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9813 int cx = 0, cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9814
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9815 /* Window is mapped query the frame size directly */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9816 if(window && gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9817 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9818 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9819 gint gwidth, gheight;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9820
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9821 /* Calculate the border size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9822 gdk_window_get_frame_extents(window, &frame);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9823 gdk_window_get_geometry(window, NULL, NULL, &gwidth, &gheight);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9824
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9825 cx = frame.width - gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9826 if(cx < 0)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9827 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9828 cy = frame.height - gheight;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9829 if(cy < 0)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9830 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9831 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9832 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9833 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9834 /* Check if we have cached frame size values */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9835 if(!((cx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_width"))) \|
1471 26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9836 (cy = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_height")))))
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9837 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9838 /* If not try to ask the window manager for the estimated size...
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9839 * and finally if all else fails, guess.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9840 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9841 _dw_get_frame_extents(handle, &cy, &cx);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9842 /* Cache values for later use */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9843 g_object_set_data(G_OBJECT(handle), "_dw_frame_width", GINT_TO_POINTER(cx));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9844 g_object_set_data(G_OBJECT(handle), "_dw_frame_height", GINT_TO_POINTER(cy));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9845 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9846 /* Save the size for when it is shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9847 g_object_set_data(G_OBJECT(handle), "_dw_width", GINT_TO_POINTER(width));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9848 g_object_set_data(G_OBJECT(handle), "_dw_height", GINT_TO_POINTER(height));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9849 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9850 /* Resize minus the border size */
1471 26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9851 if(width > cx && height > cy)
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9852 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9853 gtk_window_resize(GTK_WINDOW(handle), width - cx , height - cy );
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9854 gtk_window_set_default_size(GTK_WINDOW(handle), width - cx, height - cy);
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9855 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9856 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9857 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9858 gtk_widget_set_size_request(handle, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9859 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9860 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9861
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9862 /*
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9863 * Gets the size the system thinks the widget should be.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9864 * Parameters:
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9865 * handle: Window handle of the item to be back.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9866 * width: Width in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9867 * height: Height in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9868 */
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9869 void API dw_window_get_preferred_size(HWND handle, int width, int height)
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9870 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9871 int _dw_locked_by_me = FALSE;
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9872
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9873 DW_MUTEX_LOCK;
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9874 if(GTK_IS_SCROLLED_WINDOW(handle))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9875 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9876 gint scrolledwidth, scrolledheight;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9877
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	9878 _dw_get_scrolled_size(handle, &scrolledwidth, &scrolledheight);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9879
1561 46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9880 if(width)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9881 *width = scrolledwidth;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9882 if(height)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9883 *height = scrolledheight;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9884 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9885 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9886 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9887 if(width)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9888 gtk_widget_get_preferred_width(handle, NULL, width);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9889 if(height)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9890 gtk_widget_get_preferred_height(handle, NULL, height);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9891 }
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9892 DW_MUTEX_UNLOCK;
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9893 }
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9894
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9895 /* Internal version to simplify the code with multiple versions of GTK */
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9896 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9897 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9898 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9899 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9900 GdkDisplay *display = gdk_display_get_default();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9901
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9902 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9903 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9904 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9905
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9906 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9907 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9908 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9909 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9910 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9911 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9912 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9913 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9914 return 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9915 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9916 return gdk_screen_width();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9917 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9918 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9919
1429 fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1426 diff changeset	9920 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9921 * Returns the width of the screen.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9922 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9923 int dw_screen_width(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9924 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9925 int retval = 0;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9926 int _dw_locked_by_me = FALSE;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9927
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9928 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9929 retval = _dw_screen_width();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9930 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9931 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9932 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9933
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9934 /* Internal version to simplify the code with multiple versions of GTK */
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9935 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9936 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9937 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9938 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9939 GdkDisplay *display = gdk_display_get_default();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9940
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9941 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9942 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9943 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9944
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9945 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9946 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9947 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9948 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9949 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9950 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9951 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9952 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9953 return 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9954 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9955 return gdk_screen_height();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9956 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9957 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9958
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9959 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9960 * Returns the height of the screen.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9961 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9962 int dw_screen_height(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9963 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9964 int retval;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9965 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9966
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9967 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9968 retval = _dw_screen_height();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9969 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9970 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9971 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9972
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9973 /* This should return the current color depth */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9974 unsigned long dw_color_depth_get(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9975 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9976 int retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9977 GdkVisual *vis;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	9978 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9979
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9980 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9981 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9982 vis = gdk_screen_get_system_visual(gdk_screen_get_default());
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9983 #else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9984 vis = gdk_visual_get_system();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9985 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9986 retval = gdk_visual_get_depth(vis);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9987 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9988 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9989 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9990
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991 /*
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9992 * Sets the gravity of a given window (widget).
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9993 * Gravity controls which corner of the screen and window the position is relative to.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9994 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9995 * handle: Window (widget) handle.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9996 * horz: DW_GRAV_LEFT (default), DW_GRAV_RIGHT or DW_GRAV_CENTER.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9997 * vert: DW_GRAV_TOP (default), DW_GRAV_BOTTOM or DW_GRAV_CENTER.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9998 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9999 void API dw_window_set_gravity(HWND handle, int horz, int vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10000 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10001 dw_window_set_data(handle, "_dw_grav_horz", DW_INT_TO_POINTER(horz));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10002 dw_window_set_data(handle, "_dw_grav_vert", DW_INT_TO_POINTER(vert));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10003 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10004
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10005 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10006 * Sets the position of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10007 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10008 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10009 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10010 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10011 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10012 void dw_window_set_pos(HWND handle, long x, long y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10013 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10014 int _dw_locked_by_me = FALSE;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10015 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10016 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10017 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10018
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10019 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10020 return;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10021
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10022 DW_MUTEX_LOCK;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10023 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10024 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10025 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10026 gtk_mdi_move(GTK_MDI(mdi), handle, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10027 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10028 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10029 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10030 {
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10031 GdkWindow *window = NULL;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10032
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10033 if(GTK_IS_WINDOW(handle))
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10034 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10035 GdkWindow *window = gtk_widget_get_window(handle);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10036 int horz = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_grav_horz"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10037 int vert = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_grav_vert"));
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10038 int cx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_width"));
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10039 int cy = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_height"));
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10040 int newx = x, newy = y, width = 0, height = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10041
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10042 /* If the window is mapped */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10043 if(window && gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10044 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10045 /* If we need the width or height... */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10046 if(horz \|\| vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10047 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10048 GdkRectangle frame;
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10049 int count = 0;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10050
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10051 /* Get the frame size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10052 gdk_window_get_frame_extents(window, &frame);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10053
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10054 /* FIXME: Sometimes we get returned an invalid 200x200
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10055 * result... so if we get this... try the call a second
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10056 * time and hope for a better result.
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10057 */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10058 while((frame.width == 200 \|\| frame.width == (200 + cx)) &&
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10059 (frame.height == 200 \|\| frame.height == (200 + cy)) && count < 10)
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10060 {
1505 fcdd9e3c735a Use _dw_msleep() insetad of dw_main_sleep() when pausing to get the frame extents bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1501 diff changeset	10061 _dw_msleep(1);
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10062 count++;
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10063 gdk_window_get_frame_extents(window, &frame);
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10064 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10065 width = frame.width;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10066 height = frame.height;
1470 a317c2ec1d4c On GTK2 gtk_window_move() needs to be called after mapping the window... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1469 diff changeset	10067 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10068 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10069 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10070 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10071 /* Check if we have cached frame size values */
1476 d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	10072 if(!(cx \| cy))
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10073 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10074 /* If not try to ask the window manager for the estimated size...
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10075 * and finally if all else fails, guess.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10076 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10077 _dw_get_frame_extents(handle, &cy, &cx);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10078 /* Cache values for later use */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10079 g_object_set_data(G_OBJECT(handle), "_dw_frame_width", GINT_TO_POINTER(cx));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10080 g_object_set_data(G_OBJECT(handle), "_dw_frame_height", GINT_TO_POINTER(cy));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10081 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10082 /* Save the positions for when it is shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10083 g_object_set_data(G_OBJECT(handle), "_dw_x", GINT_TO_POINTER(x));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10084 g_object_set_data(G_OBJECT(handle), "_dw_y", GINT_TO_POINTER(y));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10085 g_object_set_data(G_OBJECT(handle), "_dw_pos", GINT_TO_POINTER(1));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10086 /* Check to see if there is a pending size request too */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10087 width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10088 height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height"));
1470 a317c2ec1d4c On GTK2 gtk_window_move() needs to be called after mapping the window... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1469 diff changeset	10089 if(!width \|\| !height)
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10090 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10091 /* Ask what GTK is planning on suggesting for the window size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10092 gtk_window_get_size(GTK_WINDOW(handle), !width ? &width : NULL, !height ? &height : NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10093 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10094 /* Add the frame size to it */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10095 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10096 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10097 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10098 /* Do any gravity calculations */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10099 if(horz \|\| vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10100 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10101 /* Handle horizontal center gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10102 if((horz & 0xf) == DW_GRAV_CENTER)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10103 newx += ((_dw_screen_width() / 2) - (width / 2));
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10104 /* Handle right gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10105 else if((horz & 0xf) == DW_GRAV_RIGHT)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10106 newx = _dw_screen_width() - width - x;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10107 /* Handle vertical center gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10108 if((vert & 0xf) == DW_GRAV_CENTER)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10109 newy += ((_dw_screen_height() / 2) - (height / 2));
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10110 else if((vert & 0xf) == DW_GRAV_BOTTOM)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10111 newy = _dw_screen_height() - height - y;
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10112
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10113 #if GTK_CHECK_VERSION(3,3,8)
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10114 /* Adjust the values to avoid Gnome bar if requested */
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10115 if((horz \| vert) & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10116 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10117 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10118 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10119 GdkDisplay *display = gdk_display_get_default();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10120
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10121 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10122 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10123 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10124
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10125 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10126 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10127 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10128 #else
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10129 GdkScreen *screen = gdk_screen_get_default();
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10130
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10131 gdk_screen_get_monitor_workarea(screen, 0, &rect);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10132 #endif
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10133 if(horz & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10134 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10135 if((horz & 0xf) == DW_GRAV_LEFT)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10136 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10137 else if((horz & 0xf) == DW_GRAV_RIGHT)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10138 newx -= _dw_screen_width() - (rect.x + rect.width);
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10139 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10140 if(vert & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10141 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10142 if((vert & 0xf) == DW_GRAV_TOP)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10143 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10144 else if((vert & 0xf) == DW_GRAV_BOTTOM)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10145 newy -= _dw_screen_height() - (rect.y + rect.height);
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10146 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10147 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10148 #endif
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10149 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10150 /* Finally move the window into place */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10151 gtk_window_move(GTK_WINDOW(handle), newx, newy);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10152 }
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10153 else if((window = gtk_widget_get_window(handle)))
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10154 gdk_window_move(window, x, y);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10155 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10156 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10157 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10159 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10160 * Sets the position and size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10161 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10162 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10163 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10164 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10165 * width: Width of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10166 * height: Height of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10167 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10168 void dw_window_set_pos_size(HWND handle, long x, long y, unsigned long width, unsigned long height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10169 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10170 dw_window_set_size(handle, width, height);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10171 dw_window_set_pos(handle, x, y);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10172 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10174 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10175 * Gets the position and size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10176 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10177 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10178 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10179 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10180 * width: Width of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10181 * height: Height of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10182 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10183 void dw_window_get_pos_size(HWND handle, long x, long y, ULONG width, ULONG height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10184 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10185 int _dw_locked_by_me = FALSE;
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10186 gint gx = 0, gy = 0, gwidth = 0, gheight = 0;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10187 #ifdef DW_INCLUDE_DEPRECATED
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10188 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10189 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10190
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10191 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10192 #ifdef DW_INCLUDE_DEPRECATED
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10193 /* If it is an MDI window query what we can */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10194 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10195 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10196 gtk_mdi_get_pos(GTK_MDI(mdi), handle, &gx, &gy);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10197 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10198 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10199 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10201 GdkWindow *window;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10202
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10203 /* Can only query if the window is realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10204 if(handle && (window = gtk_widget_get_window(handle)))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10205 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10206 /* If it is a toplevel window */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10207 if(GTK_IS_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10208 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10209 if(gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10210 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10211 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10212
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10213 /* Calculate the border rectangle */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10214 gdk_window_get_frame_extents(window, &frame);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10215 gx = frame.x;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10216 gy = frame.y;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10217 gwidth = frame.width;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10218 gheight = frame.height;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10219 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10220 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10221 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10222 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10223 /* Get an individual widget coordinates */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10224 gdk_window_get_geometry(window, &gx, &gy, &gwidth, &gheight);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10225 gdk_window_get_root_origin(window, &gx, &gy);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10226 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10227 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10228 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10229 /* Fill in the requested fields */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10230 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10231 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10232 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10233 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10234 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10235 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10236 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10237 *height = gheight;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10239 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10240
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10241 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10242 * Sets the style of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10243 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10244 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10245 * width: New width in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10246 * height: New height in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10247 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10248 void dw_window_set_style(HWND handle, unsigned long style, unsigned long mask)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10249 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10250 GtkWidget *handle2 = handle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10251 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10252
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10253 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10254 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10255 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10256 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10257 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10258 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10259 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10260 else if(GTK_IS_FRAME(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10261 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10262 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_label");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10263 if(tmp && GTK_IS_LABEL(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10264 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10265 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10266 else if(GTK_IS_BUTTON(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10267 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10268 if(mask & DW_BS_NOBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10269 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10270 if(style & DW_BS_NOBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10271 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10272 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NONE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10273 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10274 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10275 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10276 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NORMAL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10277 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10278 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10279 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10280 if ( GTK_IS_LABEL(handle2) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10281 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10282 gfloat x=DW_LEFT, y=DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10283 /* horizontal... */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10284 if ( style & DW_DT_CENTER )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10285 x = DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10286 if ( style & DW_DT_RIGHT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10287 x = DW_RIGHT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10288 if ( style & DW_DT_LEFT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10289 x = DW_LEFT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10290 /* vertical... */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10291 if ( style & DW_DT_VCENTER )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10292 y = DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10293 if ( style & DW_DT_TOP )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10294 y = DW_TOP;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10295 if ( style & DW_DT_BOTTOM )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10296 y = DW_BOTTOM;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10297 #if GTK_CHECK_VERSION(3,16,0)
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10298 gtk_label_set_xalign(GTK_LABEL(handle2), x);
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10299 gtk_label_set_yalign(GTK_LABEL(handle2), y);
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	10300 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	10301 gtk_misc_set_alignment(GTK_MISC(handle2), x, y);
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	10302 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10303 if ( style & DW_DT_WORDBREAK )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10304 gtk_label_set_line_wrap( GTK_LABEL(handle), TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10305 }
1314 c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10306 if ( GTK_IS_CHECK_MENU_ITEM(handle2) && (mask & (DW_MIS_CHECKED \| DW_MIS_UNCHECKED)) )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10307 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10308 int check = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10309
1314 c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10310 if ( style & DW_MIS_CHECKED )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10311 check = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10312
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10313 _dw_ignore_click = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10314 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(handle2)) != check)
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10315 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(handle2), check);
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10316 _dw_ignore_click = 0;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10317 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10318 if ( (GTK_IS_CHECK_MENU_ITEM(handle2) \|\| GTK_IS_MENU_ITEM(handle2)) && (mask & (DW_MIS_ENABLED \| DW_MIS_DISABLED) ))
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10319 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10320 _dw_ignore_click = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10321 if ( style & DW_MIS_ENABLED )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10322 gtk_widget_set_sensitive( handle2, TRUE );
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10323 else
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10324 gtk_widget_set_sensitive( handle2, FALSE );
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10325 _dw_ignore_click = 0;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10326 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10328 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10330 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 * Adds a new page to specified notebook.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10332 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10333 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10334 * flags: Any additional page creation flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10335 * front: If TRUE page is added at the beginning.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10336 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10337 unsigned long dw_notebook_page_new(HWND handle, unsigned long flags, int front)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10338 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10339 int z;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10340 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10341 GtkWidget **pagearray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10343 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10344 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10345
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10346 if(pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10347 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10348 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10349 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10350 if(!pagearray[z])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10351 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10352 char text[101] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10353 int num = z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10354
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10355 if(front)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10356 num \|= 1 << 16;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10357
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10358 snprintf(text, 100, "_dw_page%d", z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10359 /* Save the real id and the creation flags */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10360 g_object_set_data(G_OBJECT(handle), text, GINT_TO_POINTER(num));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10361 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10362 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10363 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10364 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10365 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10366 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10368 /* Hopefully this won't happen. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10369 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10370 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10371
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10372 /* Return the physical page id from the logical page id */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10373 int _dw_get_physical_page(HWND handle, unsigned long pageid)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10374 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10375 int z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10376 GtkWidget thispage, *pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10377
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 if(pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10379 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10380 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10381 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10382 if((thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10383 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10384 if(thispage == pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10385 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10386 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10387 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10388 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10389 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10390 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10391
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10392 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10393 * Remove a page from a notebook.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10394 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10395 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10396 * pageid: ID of the page to be destroyed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10397 */
2909 3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2904 diff changeset	10398 void dw_notebook_page_destroy(HWND handle, unsigned long pageid)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10399 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10400 int realpage, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10401 GtkWidget **pagearray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10402
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10404 realpage = _dw_get_physical_page(handle, pageid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10405 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10408 if((pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray")))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10409 pagearray[pageid] = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10411 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10412 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10414 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 * Queries the currently visible page ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10418 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419 unsigned long dw_notebook_page_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10420 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10421 int retval, phys;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10422 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10423
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10424 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10425 phys = gtk_notebook_get_current_page(GTK_NOTEBOOK(handle));
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10426 retval = _dw_get_logical_page(handle, phys);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10427 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10428 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10429 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10430
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10431 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10432 * Sets the currently visibale page ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10433 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10434 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 * pageid: ID of the page to be made visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10436 */
2909 3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set() bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2904 diff changeset	10437 void dw_notebook_page_set(HWND handle, unsigned long pageid)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10438 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10439 int realpage, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10440
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10441 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10442 realpage = _dw_get_physical_page(handle, pageid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10443 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10444 gtk_notebook_set_current_page(GTK_NOTEBOOK(handle), pageid);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10445 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10446 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10448
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10450 * Sets the text on the specified notebook tab.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10451 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10452 * handle: Notebook handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10453 * pageid: Page ID of the tab to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10454 * text: Pointer to the text to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10455 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10456 void dw_notebook_page_set_text(HWND handle, unsigned long pageid, const char *text)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458 GtkWidget *child;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10459 int realpage, _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10460
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10461 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	10462 realpage = _dw_get_physical_page(handle, pageid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10463 if(realpage < 0 \|\| realpage > 255)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10464 {
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10465 char ptext[101] = {0};
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10466 int num;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10467
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10468 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	10469 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10470 realpage = 0xFF & num;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10471 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10472
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10473 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10474 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10475 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10476 if(child)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10477 gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(handle), child, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10478 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10479 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10480 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10481
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10482 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10483 * Sets the text on the specified notebook tab status area.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10484 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10485 * handle: Notebook handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10486 * pageid: Page ID of the tab to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10487 * text: Pointer to the text to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10488 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10489 void dw_notebook_page_set_status_text(HWND handle, unsigned long pageid, const char *text)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10490 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10491 /* TODO (if possible) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10492 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10493
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10494 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10495 * Packs the specified box into the notebook page.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10496 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10497 * handle: Handle to the notebook to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10498 * pageid: Page ID in the notebook which is being packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10499 * page: Box handle to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10500 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10501 void dw_notebook_pack(HWND handle, unsigned long pageid, HWND page)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10502 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10503 GtkWidget label, child, oldlabel, *pagearray;
790 1822c8a71936 Removed a now unused helper function and fixed a discared qualifier error. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 789 diff changeset	10504 const gchar *text = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10505 int num, z, realpage = -1, pad, _dw_locked_by_me = FALSE;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10506 char ptext[101] = {0};
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10507
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10508 DW_MUTEX_LOCK;
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	10509 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	10510 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10511 g_object_set_data(G_OBJECT(handle), ptext, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10512 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10513
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10514 if(!pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10515 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10516 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10517 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10518 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10519
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10520 /* The page already exists... so get it's current page */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10521 if(pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10522 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10523 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10524 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10525 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10526 if(child == pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10527 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10528 oldlabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(handle), child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10529 if(oldlabel)
789 8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	10530 text = gtk_label_get_text(GTK_LABEL(oldlabel));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10531 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), z);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10532 realpage = z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10533 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10534 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10535 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10536 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10538 pagearray[pageid] = page;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10539
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10540 label = gtk_label_new(text ? text : "");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10541
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10542 if(GTK_IS_GRID(page))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10543 {
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	10544 pad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(page), "_dw_boxpad"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10545 gtk_container_set_border_width(GTK_CONTAINER(page), pad);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10546 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10548 if(realpage != -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10549 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10550 else if(num & ~(0xFF))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10551 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10552 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10553 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 256);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10554 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10555 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10556
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10558 * Appends the specified text to the listbox's (or combobox) entry list.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10559 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10560 * handle: Handle to the listbox to be appended to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10561 * text: Text to append into listbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10562 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10563 void dw_listbox_append(HWND handle, const char *text)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10564 {
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10565 dw_listbox_insert(handle, text, -1);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10566 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10567
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10568 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10569 * Inserts the specified text int the listbox's (or combobox) entry list at the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10570 * position indicated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10571 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10572 * handle: Handle to the listbox to be appended to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10573 * text: Text to insert into listbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 * pos: 0-based index into listbox. -1 will append
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10575 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10576 void dw_listbox_insert(HWND handle, const char *text, int pos)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10577 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10578 GtkWidget *handle2 = handle;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10579 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10580 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10581
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10582 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10583 /* Get the inner handle for scrolled controls */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10584 if(GTK_IS_SCROLLED_WINDOW(handle))
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10585 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10586 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10587 if(tmp)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10588 handle2 = tmp;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10589 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10590 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10591 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10592 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10593
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10594 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10595 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10596 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10597 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10598 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10599
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10600 if(!store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10601 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10602 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10603 return;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10604 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10605
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10606 if(pos < 0)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10607 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10608 /* Insert an entry at the end */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10609 gtk_list_store_append(store, &iter);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10610 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10611 else
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10612 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10613 /* Insert at position */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10614 gtk_list_store_insert(store, &iter, pos);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10615 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10616 gtk_list_store_set (store, &iter, 0, text, -1);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10617 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10618 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10619 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10620
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10621 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10622 * Appends the specified text items to the listbox's (or combobox) entry list.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10623 * Parameters:
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10624 * handle: Handle to the listbox to be appended to.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10625 * text: Text strings to append into listbox.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10626 * count: Number of text strings to append
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10627 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10628 void dw_listbox_list_append(HWND handle, char **text, int count)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10629 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10630 GtkWidget *handle2 = handle;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10631 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10632 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10633
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10634 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10635 /* Get the inner handle for scrolled controls */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10636 if(GTK_IS_SCROLLED_WINDOW(handle))
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10637 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10638 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10639 if(tmp)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10640 handle2 = tmp;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10641 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10642 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10643 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10644 int z;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10645 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10646
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10647 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10648 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10649 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10650 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10651 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10652
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10653 if(!store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10654 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10655 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10656 return;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10657 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10658
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10659 /* Insert entries at the end */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10660 for(z=0;z<count;z++)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10661 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10662 gtk_list_store_append(store, &iter);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10663 gtk_list_store_set (store, &iter, 0, text[z], -1);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10664 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10665 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10666 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10667 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10668
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10669 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10670 * Clears the listbox's (or combobox) list of all entries.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10671 * Parameters:
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10672 * handle: Handle to the listbox to be cleared.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10673 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10674 void dw_listbox_clear(HWND handle)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10675 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10676 GtkWidget *handle2 = handle;
777 c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10677 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10678 int _dw_locked_by_me = FALSE;
777 c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10679
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10680 DW_MUTEX_LOCK;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10681 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10682 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10683 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10684 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10685 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10686 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10687 }
777 c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10688 if(handle2)
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10689 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10690 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10691 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10692 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
777 c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10693 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10694 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10695
777 c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10696 if(!store)
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10697 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10698 DW_MUTEX_UNLOCK;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10699 return;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10700 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10701 /* Clear the list */
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10702 gtk_list_store_clear(store);
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10703 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10704 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10705 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10706
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10707 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10708 * Returns the listbox's item count.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10709 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10710 * handle: Handle to the listbox to be counted
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10711 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10712 int dw_listbox_count(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10713 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10714 GtkWidget *handle2 = handle;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10715 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10716 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10717 int retval = 0;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10718
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10719 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10720 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10721 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10722 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10723 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10724 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10725 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10726 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10727 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10728 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10729 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10730 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10731 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10732 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10733 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10734
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10735 if(store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10736 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10737 /* Get the number of children at the top level */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10738 retval = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10739 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10740 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10741 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10744
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10745 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10746 * Sets the topmost item in the viewport.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10747 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10748 * handle: Handle to the listbox to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10749 * top: Index to the top item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10750 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10751 void dw_listbox_set_top(HWND handle, int top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10752 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10753 GtkWidget *handle2 = handle;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10754 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10755
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10756 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10757 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10758 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10759 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10760 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10761 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10762 }
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10763 /* Make sure it is the correct tree type */
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10764 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10765 {
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10766 GtkAdjustment *adjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(handle));
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10767 GtkListStore store = (GtkListStore )gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10768
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10769 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10770 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10771 /* Get the number of children at the top level */
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10772 gint rowcount = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10773 gdouble pagesize = gtk_adjustment_get_page_size(adjust);
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10774 gdouble upper = gtk_adjustment_get_upper(adjust) - pagesize;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10775 gdouble lower = gtk_adjustment_get_lower(adjust);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10776 gdouble change;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10777
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10778 /* Safety check */
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10779 if(rowcount < 2)
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10780 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10781 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10782 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10783 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10784
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10785 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10786 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10787 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10788 top = rowcount;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10789
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10790 change = ((gdouble)top/(gdouble)rowcount) * (upper - lower);
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10791
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10792 gtk_adjustment_set_value(adjust, change + lower);
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10793 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10794 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10795 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10796 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10797
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10798 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10799 * Copies the given index item's text into buffer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10800 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10801 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10802 * index: Index into the list to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10803 * buffer: Buffer where text will be copied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10804 * length: Length of the buffer (including NULL).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10806 void dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10808 GtkWidget *handle2 = handle;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10809 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10810 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10811
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10812 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10813 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10814 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10815 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10816 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10817 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10818 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10819 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10820 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10821 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10822 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10823 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10824 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10825 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10826 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10827
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10828 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10829 {
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10830 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10831
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10832 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10833 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10834 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10835 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10836 gchar *text;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10837 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, _DW_DATA_TYPE_STRING, &text, -1);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10838 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10839 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10840 strncpy(buffer, text, length);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10841 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10842 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10843 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10844 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10845 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10846 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10847 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10848 buffer[0] = '\0';
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10849 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10850 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10851
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10852 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10853 * Sets the text of a given listbox entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10854 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10856 * index: Index into the list to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10857 * buffer: Buffer where text will be copied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10858 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10859 void dw_listbox_set_text(HWND handle, unsigned int index, const char *buffer)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10860 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10861 GtkWidget *handle2 = handle;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10862 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10863 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10864
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10865 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10866 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10867 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10868 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10869 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10870 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10871 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10872 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10873 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10874 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10875 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10876 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10877 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10878 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10879 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10880
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10881 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10882 {
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10883 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10884
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10885 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10886 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10887 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10888 /* Update the text */
2744 608796a91527 GTK3/4: Committing a fix from Mark Hessling for dw_listbox_set_text(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2663 diff changeset	10889 gtk_list_store_set(store, &iter, 0, buffer, -1);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10890 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10891 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10892 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10893 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10894 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10895
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10896 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10897 * Returns the index to the current selected item or -1 when done.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10898 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10899 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10900 * where: Either the previous return or -1 to restart.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10901 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10902 int dw_listbox_selected_multi(HWND handle, int where)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10903 {
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10904 GtkWidget *handle2;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10905 GtkListStore *store = NULL;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10906 int retval = DW_LIT_NONE;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10907 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10908
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10909 DW_MUTEX_LOCK;
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10910 handle2 = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10911
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10912 /* Make sure it is the correct tree type */
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10913 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10914 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10915
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10916 if(store)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10917 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10918 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10919 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10920
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10921 if(list)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10922 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10923 int counter = 0;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10924 GtkTreePath *path = g_list_nth_data(list, 0);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10925
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10926 while(path)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10927 {
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10928 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10929
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10930 if(indices && indices[0] > where)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10931 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10932 retval = indices[0];
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10933 break;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10934 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10935
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10936 counter++;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10937 path = g_list_nth_data(list, counter);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10939
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10940 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10941 g_list_free(list);
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10942 }
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	10943 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10944 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10945 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10947
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10949 * Returns the index to the item in the list currently selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10950 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10951 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10952 */
986 87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 976 diff changeset	10953 int dw_listbox_selected(HWND handle)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10954 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10955 GtkWidget *handle2 = handle;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10956 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	10957 int _dw_locked_by_me = FALSE;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10958 unsigned int retval = 0;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10959
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10960 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10961 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10962 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10963 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10964 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10965 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10966 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10967 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10968 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10969 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10970 /* Make sure it is the correct tree type */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10971 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10972 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10973 else if(GTK_IS_COMBO_BOX(handle2))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10974 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10975
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10976 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10977 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10978 if(GTK_IS_TREE_VIEW(handle2))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10979 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10980 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10981 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10982 if(list)
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10983 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10984 GtkTreePath *path = g_list_nth_data(list, 0);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10985 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10986
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10987 if(indices)
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10988 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10989 retval = indices[0];
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10990 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10991
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10992 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10993 g_list_free(list);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10994 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10995 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10996 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10997 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10998 GtkTreeIter iter;
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10999 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11000
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11001 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(handle2), &iter))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11002 {
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11003 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11004 if(path)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11005 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11006 gint *indices = gtk_tree_path_get_indices(path);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11007
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11008 if(indices)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11009 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11010 retval = indices[0];
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11011 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11012 gtk_tree_path_free(path);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	11013 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11014 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11015 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11016 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11017 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11018 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11019 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11022 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11023 * Sets the selection state of a given index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11024 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11025 * handle: Handle to the listbox to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11026 * index: Item index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11027 * state: TRUE if selected FALSE if unselected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11028 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11029 void dw_listbox_select(HWND handle, int index, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11030 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11031 GtkWidget *handle2 = handle;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11032 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11033 int _dw_locked_by_me = FALSE;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11034
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11035 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11036 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11037 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11038 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11039 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11040 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11041 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11042 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11043 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11044 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11045 /* Make sure it is the correct tree type */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11046 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11047 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11048 else if(GTK_IS_COMBO_BOX(handle2))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11049 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11050
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11051 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11052 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11053 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11054
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11055 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11056 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11057 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11058 if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11059 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11060 gtk_combo_box_set_active_iter(GTK_COMBO_BOX(handle2), &iter);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11061 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11062 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11063 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11064 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11065 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11066 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11067 /* Select the item */
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11068 gtk_tree_selection_select_iter(sel, &iter);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11069 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11070 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11071 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11072 /* Deselect the item */
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11073 gtk_tree_selection_unselect_iter(sel, &iter);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	11074 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11075 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11076 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11077 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11078 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11079 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11080 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11081
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11082 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11083 * Deletes the item with given index from the list.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11084 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11085 * handle: Handle to the listbox to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11086 * index: Item index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11087 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11088 void dw_listbox_delete(HWND handle, int index)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11089 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11090 GtkWidget *handle2 = handle;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11091 GtkListStore *store = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11092 int _dw_locked_by_me = FALSE;
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11093
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11094 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11095 /* Get the inner handle for scrolled controls */
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11096 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11097 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11098 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11099 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11100 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11101 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11102 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11103 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11104 /* Make sure it is the correct tree type */
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	11105 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	11106 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11107 else if(GTK_IS_COMBO_BOX(handle2))
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	11108 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11109
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11110 if(store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11111 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11112 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11113
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11114 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11115 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11116 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11117 gtk_list_store_remove(store, &iter);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11118 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11119 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	11120 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11121 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11122 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11123
1353 f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11124 /* Function to do delayed positioning */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11125 gboolean _dw_splitbar_set_percent(gpointer data)
1353 f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11126 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11127 GtkWidget *widget = data;
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11128 float percent = (float )g_object_get_data(G_OBJECT(widget), "_dw_percent");
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11129
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11130 if(percent)
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11131 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11132 GtkAllocation alloc;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11133
1353 f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11134 gtk_widget_get_allocation(widget, &alloc);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11135
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11136 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(widget)) == GTK_ORIENTATION_HORIZONTAL)
1353 f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11137 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.width * (*percent / 100.0)));
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11138 else
1353 f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11139 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.height * (*percent / 100.0)));
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11140 g_object_set_data(G_OBJECT(widget), "_dw_percent", NULL);
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11141 free(percent);
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11142 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11143 return FALSE;
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11144 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11145
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11146 /* Reposition the bar according to the percentage */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11147 static gint _dw_splitbar_size_allocate(GtkWidget widget, GtkAllocation event, gpointer data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11148 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11149 float percent = (float )g_object_get_data(G_OBJECT(widget), "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11150
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11151 /* Prevent infinite recursion ;) */
1005 751522e9f3ac Switchted to using dw_paned_pack() to pack the splitbar on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1001 diff changeset	11152 if(!percent \|\| event->width < 20 \|\| event->height < 20)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11153 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11154
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11155 g_idle_add(_dw_splitbar_set_percent, widget);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11157 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11159 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11160 * Creates a splitbar window (widget) with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11161 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11162 * type: Value can be DW_VERT or DW_HORZ.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11163 * topleft: Handle to the window to be top or left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11164 * bottomright: Handle to the window to be bottom or right.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11165 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11166 * A handle to a splitbar window or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11167 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11168 HWND dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11169 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11170 GtkWidget *tmp = NULL;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11171 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11172 float *percent = malloc(sizeof(float));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11174 DW_MUTEX_LOCK;
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	11175 tmp = gtk_paned_new(type == DW_HORZ ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
1125 95d7eb4e85c6 The shrink flag on GtkPanded (splitbar) in GTK 3 causes tons bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1124 diff changeset	11176 gtk_paned_pack1(GTK_PANED(tmp), topleft, TRUE, FALSE);
95d7eb4e85c6 The shrink flag on GtkPanded (splitbar) in GTK 3 causes tons bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1124 diff changeset	11177 gtk_paned_pack2(GTK_PANED(tmp), bottomright, TRUE, FALSE);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11178 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11179 *percent = 50.0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11180 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11181 g_signal_connect(G_OBJECT(tmp), "size-allocate", G_CALLBACK(_dw_splitbar_size_allocate), NULL);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11182 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11184 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11188 * Sets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11189 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11190 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11191 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11192 void dw_splitbar_set(HWND handle, float percent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11193 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194 float mypercent = (float )dw_window_get_data(handle, "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11195 int size = 0, position;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11197 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_HORIZONTAL)
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11198 size = gtk_widget_get_allocated_width(handle);
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11199 else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11200 size = gtk_widget_get_allocated_height(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11202 if(mypercent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11203 *mypercent = percent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11204
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 if(size > 10)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11206 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 position = (int)((float)size * (percent / 100.0));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11209 gtk_paned_set_position(GTK_PANED(handle), position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11210 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11212
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11213 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11214 * Gets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11217 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11218 float dw_splitbar_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11219 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220 float percent = (float )dw_window_get_data(handle, "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 if(percent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11223 return *percent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 return 0.0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11225 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11227 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11228 * Creates a calendar window (widget) with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11229 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11230 * id: Unique identifier for calendar widget
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11232 * A handle to a calendar window or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11234 HWND dw_calendar_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11236 GtkWidget *tmp;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11237 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11238 GtkCalendarDisplayOptions flags;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 time_t now;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11240 struct tm *tmdata;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11241
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11242 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11243 tmp = gtk_calendar_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11244 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11246 /* select today */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 flags = GTK_CALENDAR_SHOW_HEADING\|GTK_CALENDAR_SHOW_DAY_NAMES;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 gtk_calendar_set_display_options( GTK_CALENDAR(tmp), flags );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11249 now = time( NULL );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11250 tmdata = localtime( & now );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11251 gtk_calendar_select_month( GTK_CALENDAR(tmp), tmdata->tm_mon, 1900+tmdata->tm_year );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11252 gtk_calendar_select_day( GTK_CALENDAR(tmp), tmdata->tm_mday );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11254 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11255 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259 * Sets the current date of a calendar
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11261 * handle: The handle to the calendar returned by dw_calendar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11262 * year...
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11263 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11266 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11267
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11268 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11269 if(GTK_IS_CALENDAR(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11270 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11271 gtk_calendar_select_month(GTK_CALENDAR(handle),month-1,year);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272 gtk_calendar_select_day(GTK_CALENDAR(handle), day);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11273 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11274 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11275 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11276 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11277
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11278 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11279 * Gets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11280 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11281 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11282 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11283 void dw_calendar_get_date(HWND handle, unsigned int year, unsigned int month, unsigned int *day)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11284 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11285 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11287 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11288 if(GTK_IS_CALENDAR(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11290 gtk_calendar_get_date(GTK_CALENDAR(handle),year,month,day);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11291 month = month + 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11292 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11293 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11294 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11296
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11297 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11298 * Sets the current focus item for a window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11299 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11300 * handle: Handle to the dialog item to be focused.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11301 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11302 * This is for use after showing the window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11303 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11304 void API dw_window_set_focus(HWND handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11305 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11306 int _dw_locked_by_me = FALSE;
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11307
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11308 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11309 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11310
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11311 DW_MUTEX_LOCK;
1796 7f549994b633 Fixed tabs put in by TextMate 2... had to figure out how turn bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1795 diff changeset	11312 gtk_widget_grab_focus(handle);
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11313 DW_MUTEX_UNLOCK;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11314 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11315
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11316 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 * Sets the default focus item for a window/dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11318 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11319 * window: Toplevel window or dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 * defaultitem: Handle to the dialog item to be default.
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11321 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11322 * This is for use before showing the window/dialog.
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11323 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11324 void dw_window_default(HWND window, HWND defaultitem)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11325 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11326 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11327
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11328 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11329 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332 g_object_set_data(G_OBJECT(window), "_dw_defaultitem", (gpointer)defaultitem);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11333 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11337 * Sets window to click the default dialog item when an ENTER is pressed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11339 * window: Window (widget) to look for the ENTER press.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11340 * next: Window (widget) to move to next (or click)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11341 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11342 void dw_window_click_default(HWND window, HWND next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11343 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11344 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11345
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11346 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11349 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11350 g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(_dw_default_key_press_event), next);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11352 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11354
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11355 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11356 * Creates a new system notification if possible.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11357 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11358 * title: The short title of the notification.
2114 251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11359 * imagepath: Path to an image to display or NULL if none.
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11360 * description: A longer description of the notification,
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11361 * or NULL if none is necessary.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11362 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11363 * A handle to the notification which can be used to attach a "clicked" event if desired,
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11364 * or NULL if it fails or notifications are not supported by the system.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11365 * Remarks:
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11366 * This will create a system notification that will show in the notifaction panel
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11367 * on supported systems, which may be clicked to perform another task.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11368 */
2114 251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11369 HWND dw_notification_new(const char title, const char imagepath, const char *description, ...)
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11370 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11371 #if GLIB_CHECK_VERSION(2,40,0)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11372 GNotification *notification = g_notification_new(title);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11373
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11374 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11375 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11376 if(description)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11377 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11378 va_list args;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11379 char outbuf[1025] = {0};
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11380
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11381 va_start(args, description);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11382 vsnprintf(outbuf, 1024, description, args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11383 va_end(args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11384
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11385 g_notification_set_body(notification, outbuf);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11386 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11387 #if GLIB_CHECK_VERSION(2,52,0)
2118 c3f088266bcd GTK: Remove access() test for the image file in dw_notiication_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2117 diff changeset	11388 if(imagepath)
2114 251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11389 {
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11390 GFile *file = g_file_new_for_path(imagepath);
2117 37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11391 GBytes *bytes = g_file_load_bytes(file, NULL, NULL, NULL);
2114 251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11392
2117 37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11393 if(bytes)
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11394 {
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11395 GIcon *icon = g_bytes_icon_new(bytes);
2114 251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11396
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11397 if(icon)
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11398 g_notification_set_icon(notification, G_ICON(icon));
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11399 }
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2113 diff changeset	11400 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11401 #endif
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	11402 g_notification_set_default_action_and_target(notification, "app.notification", "t",
2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	11403 (guint64)DW_POINTER_TO_ULONGLONG(notification));
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11404 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11405 return (HWND)notification;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11406 #else
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11407 return NULL;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11408 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11409 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11410
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11411 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11412 * Sends a notification created by dw_notification_new() after attaching signal handler.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11413 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11414 * notification: The handle to the notification returned by dw_notification_new().
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11415 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11416 * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported.
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11417 */
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11418 int dw_notification_send(HWND notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11419 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11420 #if GLIB_CHECK_VERSION(2,40,0)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11421 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11422 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11423 char id[101] = {0};
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11424
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11425 /* Generate a unique ID based on the notification handle,
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11426 * so we can use it to remove the notification in dw_window_destroy().
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11427 */
2132 42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2127 diff changeset	11428 snprintf(id, 100, "dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification));
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11429 g_application_send_notification(_DWApp, id, (GNotification *)notification);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11430 return DW_ERROR_NONE;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11431 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11432 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11433 return DW_ERROR_UNKNOWN;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11434 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11435
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11436 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11437 * Returns some information about the current operating environment.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11438 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11439 * env: Pointer to a DWEnv struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 void dw_environment_query(DWEnv *env)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11442 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11443 struct utsname name;
2210 7677e1083d07 Increase _DW_ENV_STRING_SIZE to 257 bytes, this is the maximum size the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2209 diff changeset	11444 char tempbuf[_DW_ENV_STRING_SIZE] = { 0 }, *dot;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11445
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11446 uname(&name);
2063 f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11447 memset(env, '\0', sizeof(DWEnv));
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11448 strncpy(env->osName, name.sysname, sizeof(env->osName)-1);
2210 7677e1083d07 Increase _DW_ENV_STRING_SIZE to 257 bytes, this is the maximum size the bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2209 diff changeset	11449 strncpy(tempbuf, name.release, sizeof(tempbuf)-1);
2063 f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11450
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11451 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11452 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11453 #ifdef USE_WEBKIT
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11454 # ifdef USE_WEBKIT2
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11455 strncpy(env->htmlEngine, "WEBKIT2", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11456 # else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11457 strncpy(env->htmlEngine, "WEBKIT", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11458 # endif
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11459 #else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11460 strncpy(env->htmlEngine, "N/A", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11461 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11462 env->DWMajorVersion = DW_MAJOR_VERSION;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11463 env->DWMinorVersion = DW_MINOR_VERSION;
1160 924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	11464 #ifdef VER_REV
1161 e4b13cd7a002 Update configure script and fix a miscommit of the GTK3 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1160 diff changeset	11465 env->DWSubVersion = VER_REV;
1160 924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	11466 #else
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11467 env->DWSubVersion = DW_SUB_VERSION;
1160 924c8087a755 Attempt to use the subversion revision number as the sub version number. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1158 diff changeset	11468 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11469
2063 f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11470 if((dot = strchr(tempbuf, '.')) != NULL)
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11471 {
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11472 *dot = '\0';
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11473 env->MajorVersion = atoi(tempbuf);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11474 env->MinorVersion = atoi(&dot[1]);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11475 return;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11476 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11477 env->MajorVersion = atoi(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11478 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11479
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11480 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11481 * Opens a file dialog and queries user selection.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11482 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11483 * title: Title bar text for dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11484 * defpath: The default path of the open dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11485 * ext: Default file extention.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486 * flags: DW_FILE_OPEN or DW_FILE_SAVE or DW_DIRECTORY_OPEN
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11488 * NULL on error. A malloced buffer containing
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11489 * the file path on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11490 *
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11491 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11492 char dw_file_browse(const char title, const char defpath, const char ext, int flags)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11493 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11494 GtkWidget *filew;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11495
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11496 GtkFileChooserAction action;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11497 GtkFileFilter *filter1 = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11498 GtkFileFilter *filter2 = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11499 gchar *button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11500 char *filename = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11501 char buf[1000];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11502 char mypath[PATH_MAX+1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11504 switch (flags )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11505 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11506 case DW_DIRECTORY_OPEN:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11507 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11508 button = _("_Open");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11509 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11510 case DW_FILE_OPEN:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11511 action = GTK_FILE_CHOOSER_ACTION_OPEN;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11512 button = _("_Open");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11513 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11514 case DW_FILE_SAVE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11515 action = GTK_FILE_CHOOSER_ACTION_SAVE;
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11516 button = _("_Save");
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11517 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11518 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11519 dw_messagebox( "Coding error", DW_MB_OK\|DW_MB_ERROR, "dw_file_browse() flags argument invalid.");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11520 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11521 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11522 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11523
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11524 filew = gtk_file_chooser_dialog_new ( title,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11525 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11526 action,
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11527 _("_Cancel"), GTK_RESPONSE_CANCEL,
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11528 button, GTK_RESPONSE_ACCEPT,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11529 NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11531 if ( flags == DW_FILE_SAVE )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11532 gtk_file_chooser_set_do_overwrite_confirmation( GTK_FILE_CHOOSER( filew ), TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11533
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11534 if ( ext )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11535 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11536 filter1 = gtk_file_filter_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11537 sprintf( buf, "*.%s", ext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11538 gtk_file_filter_add_pattern( filter1, (gchar *)buf );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11539 sprintf( buf, "\"%s\" files", ext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11540 gtk_file_filter_set_name( filter1, (gchar *)buf );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11541 filter2 = gtk_file_filter_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11542 gtk_file_filter_add_pattern( filter2, (gchar )"" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11543 gtk_file_filter_set_name( filter2, (gchar *)"All Files" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11544 gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( filew ), filter1 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11545 gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( filew ), filter2 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11546 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11548 if ( defpath )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11549 {
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11550 struct stat buf;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11551
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	11552 if ( g_path_is_absolute( defpath ) \|\| !realpath(defpath, mypath))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11553 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11554 strcpy( mypath, defpath );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11555 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11556
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11557 /* See if the path exists */
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11558 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11559 {
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11560 /* If the path is a directory... set the current folder */
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11561 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11562 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( filew ), mypath );
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11563 else if(flags == DW_FILE_SAVE) /* Otherwise set the filename */
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11564 gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( filew ), mypath );
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11565 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11566 gtk_file_chooser_select_filename( GTK_FILE_CHOOSER( filew), mypath );
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11567 }
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11568 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11569 {
1300 9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11570 if(strchr(mypath, '/'))
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11571 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11572 unsigned long x = strlen(mypath) - 1;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11573
1300 9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11574 /* Trim off the filename */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11575 while(x > 0 && mypath[x] != '/')
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11576 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11577 x--;
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11578 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11579 if(mypath[x] == '/')
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11580 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11581 char *file = NULL;
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11582 char temp[PATH_MAX+1];
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11583
1300 9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11584 /* Save the original path in temp */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11585 strcpy(temp, mypath);
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11586 mypath[x] = 0;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11587
1300 9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11588 /* Check to make sure the trimmed piece is a directory */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11589 if(realpath(mypath, temp) && stat(temp, &buf) == 0)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11590 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11591 if(buf.st_mode & S_IFDIR)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11592 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11593 /* We now have it split */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11594 file = &mypath[x+1];
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11595 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11596 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11597
1300 9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11598 /* Select folder... */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11599 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(filew), temp );
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11600 /* ... and file separately */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11601 if(file)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11602 gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER(filew), file );
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11603 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1295 diff changeset	11604 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11605 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11606 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11607
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11608 if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11609 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11610 filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( filew ) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11611 /g_free (filename);/
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11612 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11613
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11614 gtk_widget_destroy( filew );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11615 return filename;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11616 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11617
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11618 #if GLIB_CHECK_VERSION(2,36,0)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11619 static void _dw_exec_launched(GAppLaunchContext context, GAppInfo info, GVariant *platform_data, gpointer data)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11620 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11621 g_variant_lookup(platform_data, "pid", "i", data);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11622 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11623 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11624
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11625 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11626 * Execute and external program in a seperate session.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11627 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11628 * program: Program name with optional path.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11629 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11630 * params: An array of pointers to string arguements.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11631 * Returns:
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11632 * DW_ERROR_UNKNOWN on error.
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11633 */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11634 int API dw_exec(const char program, int type, char *params)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11635 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11636 GAppInfo *appinfo = NULL;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11637 char *commandline;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11638 int retval = DW_ERROR_UNKNOWN;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11639
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11640 /* Generate a command line from the parameters */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11641 if(params && *params)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11642 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11643 int z = 0, len = 0;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11644
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11645 while(params[z])
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11646 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11647 len+=strlen(params[z]) + 1;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11648 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11649 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11650 z=1;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11651 commandline = calloc(1, len);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11652 strcpy(commandline, params[0]);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11653 while(params[z])
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11654 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11655 strcat(commandline, " ");
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11656 strcat(commandline, params[z]);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11657 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11658 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11659 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11660 else
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11661 commandline = strdup(program);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11662
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11663 /* Attempt to use app preferences to launch the application, using the selected Terminal if necessary */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11664 if((appinfo = g_app_info_create_from_commandline(commandline, NULL,
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11665 type == DW_EXEC_CON ? G_APP_INFO_CREATE_NEEDS_TERMINAL : G_APP_INFO_CREATE_NONE, NULL)))
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11666 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11667 GAppLaunchContext *context = g_app_launch_context_new();
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11668
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11669 #if GLIB_CHECK_VERSION(2,36,0)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11670 g_signal_connect(G_OBJECT(context), "launched", G_CALLBACK(_dw_exec_launched), (gpointer)&retval);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11671 #endif
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11672
2349 123e22827a82 GTK2/3: If the PID did not get returned set return to DW_ERROR_NONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2348 diff changeset	11673 if(g_app_info_launch(appinfo, NULL, context, NULL) && retval == DW_ERROR_UNKNOWN)
123e22827a82 GTK2/3: If the PID did not get returned set return to DW_ERROR_NONE. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2348 diff changeset	11674 retval = DW_ERROR_NONE;
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11675
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11676 g_object_unref(appinfo);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11677 g_object_unref(context);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11678 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11679 free(commandline);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11680 return retval;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11681 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11682
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11683 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11684 * Loads a web browser pointed at the given URL.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11685 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11686 * url: Uniform resource locator.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11687 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11688 int dw_browse(const char *url)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11689 {
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11690 /* If possible load the URL/URI using gvfs... */
2158 df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2133 diff changeset	11691 #if GTK_CHECK_VERSION(3,22,0)
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2133 diff changeset	11692 if(gtk_show_uri_on_window(NULL, url, GDK_CURRENT_TIME, NULL))
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2133 diff changeset	11693 #else
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11694 if(gtk_show_uri(gdk_screen_get_default(), url, GDK_CURRENT_TIME, NULL))
2158 df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2133 diff changeset	11695 #endif
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11696 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11697 return DW_ERROR_NONE;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11698 }
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11699 else
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11700 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11701 /* Otherwise just fall back to executing firefox...
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11702 * or the browser defined by the DW_BROWSER variable.
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11703 */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11704 char execargs[3], browser = "firefox", *tmp;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11705
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11706 tmp = getenv( "DW_BROWSER" );
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11707 if(tmp) browser = tmp;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11708 execargs[0] = browser;
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11709 execargs[1] = (char *)url;
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11710 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11711
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11712 return dw_exec(browser, DW_EXEC_GUI, execargs);
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11713 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11714 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11715
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11716 #ifdef USE_WEBKIT
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11717 /* Helper function to get the web view handle */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11718 WebKitWebView _dw_html_web_view(GtkWidget widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11719 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11720 if(widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11721 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11722 WebKitWebView web_view = (WebKitWebView )widget;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11723 if(WEBKIT_IS_WEB_VIEW(web_view))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11724 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11725 #ifndef USE_WEBKIT2
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11726 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(widget), "_dw_web_view");
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11727 if(WEBKIT_IS_WEB_VIEW(web_view))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11728 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11729 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11730 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11731 return NULL;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11732 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11733 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11734 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11735 * Causes the embedded HTML widget to take action.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11736 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11737 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11738 * action: One of the DW_HTML_* constants.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11739 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11740 void dw_html_action(HWND handle, int action)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11741 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11742 #ifdef USE_WEBKIT
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11743 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11744 WebKitWebView *web_view;
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11745
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11746 DW_MUTEX_LOCK;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11747
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11748 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11749 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11750 switch(action)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11751 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11752 case DW_HTML_GOBACK:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11753 webkit_web_view_go_back(web_view);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11754 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11755 case DW_HTML_GOFORWARD:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11756 webkit_web_view_go_forward(web_view);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11757 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11758 case DW_HTML_GOHOME:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11759 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11760 webkit_web_view_load_uri(web_view, DW_HOME_URL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11761 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11762 webkit_web_view_open(web_view, DW_HOME_URL);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11763 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11764 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11765 case DW_HTML_RELOAD:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11766 webkit_web_view_reload(web_view);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11767 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11768 case DW_HTML_STOP:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11769 webkit_web_view_stop_loading(web_view);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11770 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11771 case DW_HTML_PRINT:
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11772 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11773 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11774 WebKitPrintOperation *operation = webkit_print_operation_new(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11775 webkit_print_operation_run_dialog(operation, NULL);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11776 g_object_unref(operation);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11777 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11778 WebKitWebFrame *frame = webkit_web_view_get_focused_frame(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11779 webkit_web_frame_print(frame);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11780 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11781 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11782 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11783 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11784 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11785 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11786 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11787 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11788
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11789 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11790 * Render raw HTML code in the embedded HTML widget..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11791 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11792 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11793 * string: String buffer containt HTML code to
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11794 * be rendered.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11795 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11796 * 0 on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11797 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11798 int dw_html_raw(HWND handle, const char *string)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11799 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11800 #ifdef USE_WEBKIT
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11801 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11802 WebKitWebView *web_view;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11803
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11804 DW_MUTEX_LOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11805 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11806 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11807 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11808 webkit_web_view_load_html(web_view, string, "file:///");
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11809 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11810 webkit_web_view_load_html_string(web_view, string, "file:///");
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11811 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11812 gtk_widget_show(GTK_WIDGET(handle));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11813 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11814 DW_MUTEX_UNLOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11815 return DW_ERROR_NONE;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11816 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11817 return DW_ERROR_UNKNOWN;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11818 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11819 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11820
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11821 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11822 * Render file or web page in the embedded HTML widget..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11823 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11824 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11825 * url: Universal Resource Locator of the web or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11826 * file object to be rendered.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11827 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11828 * 0 on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11829 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11830 int dw_html_url(HWND handle, const char *url)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11831 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11832 #ifdef USE_WEBKIT
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11833 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11834 WebKitWebView *web_view;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11835
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11836 DW_MUTEX_LOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11837 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11838 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11839 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11840 webkit_web_view_load_uri(web_view, url);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11841 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11842 webkit_web_view_open(web_view, url);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11843 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11844 gtk_widget_show(GTK_WIDGET(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11845 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11846 DW_MUTEX_UNLOCK;
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11847 return DW_ERROR_NONE;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11848 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11849 return DW_ERROR_UNKNOWN;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11850 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11851 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11852
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11853 /*
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11854 * Executes the javascript contained in "script" in the HTML window.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11855 * Parameters:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11856 * handle: Handle to the HTML window.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11857 * script: Javascript code to execute.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11858 * scriptdata: Data passed to the signal handler.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11859 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11860 * Returns:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11861 * DW_ERROR_NONE (0) on success.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11862 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11863 int dw_html_javascript_run(HWND handle, const char script, void scriptdata)
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11864 {
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11865 #ifdef USE_WEBKIT
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11866 int _dw_locked_by_me = FALSE;
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11867 WebKitWebView *web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11868
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11869 DW_MUTEX_LOCK;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11870 if((web_view = _dw_html_web_view(handle)))
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11871 #ifdef USE_WEBKIT2
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	11872 webkit_web_view_run_javascript(web_view, script, NULL, _dw_html_result_event, scriptdata);
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11873 #else
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11874 webkit_web_view_execute_script(web_view, script);
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11875 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11876 DW_MUTEX_UNLOCK;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11877 return DW_ERROR_NONE;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11878 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11879 return DW_ERROR_UNKNOWN;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11880 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11881 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11882
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11883 #if defined(USE_WEBKIT) && !defined(USE_WEBKIT2)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11884 static void _dw_html_print_cb(GtkWidget widget, gpointer data)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11885 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11886 WebKitWebView *web_view = WEBKIT_WEB_VIEW(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11887 WebKitWebFrame *frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11888
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11889 frame = webkit_web_view_get_focused_frame(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11890 webkit_web_frame_print(frame);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11891 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11892
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11893 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11894 * Fired when the user right-clicks to get the popup-menu on the HTML widget
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11895 * We add a "Print" menu item to enable printing
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11896 * user_data is not used
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11897 */
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11898 static void _dw_html_populate_popup_cb(WebKitWebView web_view, GtkMenu menu, gpointer user_data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11899 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11900 GtkWidget *item = gtk_menu_item_new_with_mnemonic( _("_Print") );
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11901
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11902 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11903 g_signal_connect(item, "activate", G_CALLBACK(_dw_html_print_cb), web_view);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11904 gtk_widget_show(item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11905 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11906 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11907
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11908 /*
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11909 * Create a new HTML window (widget) to be packed.
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11910 * Parameters:
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11911 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11912 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11913 HWND dw_html_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11914 {
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	11915 GtkWidget *widget = NULL;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11916 #ifdef USE_WEBKIT
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11917 int _dw_locked_by_me = FALSE;
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11918 WebKitWebView *web_view;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11919 #ifdef USE_WEBKIT2
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11920 WebKitSettings *settings;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11921 #else
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11922 WebKitWebSettings *settings;
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11923 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11924
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11925 DW_MUTEX_LOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11926 web_view = (WebKitWebView *)webkit_web_view_new();
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11927 /* WebKit2 no longer requires a scrolled window...
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11928 * So only create a scrolled window and pack it in older versions.
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11929 */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11930 #ifndef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11931 widget = gtk_scrolled_window_new(NULL, NULL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11932 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11933 gtk_container_add(GTK_CONTAINER (widget), GTK_WIDGET(web_view));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11934 gtk_widget_show(GTK_WIDGET(web_view));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11935 g_object_set_data(G_OBJECT(widget), "_dw_web_view", (gpointer)web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11936 g_signal_connect(web_view, "populate-popup", G_CALLBACK(_dw_html_populate_popup_cb), NULL);
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11937 /* Create a new websettings and enable java script */
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11938 settings = webkit_web_settings_new();
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11939 g_object_set(G_OBJECT(settings), "enable-scripts", TRUE, NULL);
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11940 webkit_web_view_set_settings(WEBKIT_WEB_VIEW(web_view), settings);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11941 #else
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11942 settings = webkit_web_view_get_settings(web_view);
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11943 /* Make sure java script is enabled */
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11944 webkit_settings_set_enable_javascript(settings, TRUE);
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11945 webkit_web_view_set_settings(web_view, settings);
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11946 widget = (GtkWidget *)web_view;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11947 #endif
1354 1f22addc2722 Changed the behavior of dw_html_new() to return NULL on failure like the documentation indicates... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1353 diff changeset	11948 gtk_widget_show(widget);
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11949 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11950 #else
1358 2f5e54b0c5c4 dw_debug() lines in dw_html_new() should end with a newline. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1355 diff changeset	11951 dw_debug( "HTML widget not available; you do not have access to webkit.\n" );
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11952 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11953 return widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11954 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11955
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11956 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11957 * Gets the contents of the default clipboard as text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11958 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11959 * None.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11960 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11961 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11962 * be converted to text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11963 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11964 char *dw_clipboard_get_text()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11965 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11966 int _dw_locked_by_me = FALSE;
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11967 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11968 char *ret = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11969
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11970 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11971 if((clipboard_object = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD )))
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11972 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11973 gchar *clipboard_contents;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11974
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11975 if((clipboard_contents = gtk_clipboard_wait_for_text( clipboard_object )))
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11976 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11977 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11978 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11979 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11980 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11981 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11982 return ret;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11983 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11984
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11985 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11986 * Sets the contents of the default clipboard to the supplied text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11987 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11988 * Text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11989 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11990 void dw_clipboard_set_text(const char *str, int len)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11991 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	11992 int _dw_locked_by_me = FALSE;
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11993 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11994
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11995 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11996 if((clipboard_object = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD )))
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11997 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11998 gtk_clipboard_set_text( clipboard_object, str, len );
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11999 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12000 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12001 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12002
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12003 /* Internal function to create the drawable pixmap and call the function */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12004 static void _dw_draw_page(GtkPrintOperation operation, GtkPrintContext context, int page_nr)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12005 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12006 cairo_t *cr = gtk_print_context_get_cairo_context(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12007 void *drawdata = g_object_get_data(G_OBJECT(operation), "_dw_drawdata");
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12008 int (drawfunc)(HPRINT, HPIXMAP, int, void ) = g_object_get_data(G_OBJECT(operation), "_dw_drawfunc");
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12009 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12010 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12011
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12012 if(cr && drawfunc && (pixmap = calloc(1,sizeof(struct _hpixmap))))
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12013 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12014 pixmap->image = cairo_get_group_target(cr);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12015 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12016 pixmap->width = gtk_print_context_get_width(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12017 pixmap->height = gtk_print_context_get_height(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12018 result = drawfunc((HPRINT)operation, pixmap, page_nr, drawdata);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12019 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12020 gtk_print_operation_draw_page_finish(operation);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12021 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12022 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12023 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12024
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12025 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12026 * Creates a new print object.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12027 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	12028 * jobname: Name of the print job to show in the queue.
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12029 * flags: Flags to initially configure the print object.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12030 * pages: Number of pages to print.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12031 * drawfunc: The pointer to the function to be used as the callback.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12032 * drawdata: User data to be passed to the handler function.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12033 * Returns:
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1136 diff changeset	12034 * A handle to the print object or NULL on failure.
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12035 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12036 HPRINT API dw_print_new(const char jobname, unsigned long flags, unsigned int pages, void drawfunc, void *drawdata)
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12037 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12038 GtkPrintOperation *op;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12039 int _dw_locked_by_me = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12040
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12041 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12042 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12043
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12044 DW_MUTEX_LOCK;
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12045 if((op = gtk_print_operation_new()))
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12046 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12047 gtk_print_operation_set_n_pages(op, pages);
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	12048 gtk_print_operation_set_job_name(op, jobname ? jobname : "Dynamic Windows Print Job");
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12049 g_object_set_data(G_OBJECT(op), "_dw_drawfunc", drawfunc);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12050 g_object_set_data(G_OBJECT(op), "_dw_drawdata", drawdata);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12051 g_signal_connect(op, "draw_page", G_CALLBACK(_dw_draw_page), NULL);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12052 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12053 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12054 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12055 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12056
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12057 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12058 * Runs the print job, causing the draw page callbacks to fire.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12059 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12060 * print: Handle to the print object returned by dw_print_new().
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12061 * flags: Flags to run the print job.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12062 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12063 * DW_ERROR_UNKNOWN on error or DW_ERROR_NONE on success.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12064 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12065 int API dw_print_run(HPRINT print, unsigned long flags)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12066 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12067 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12068 GtkPrintOperation op = (GtkPrintOperation )print;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12069 int _dw_locked_by_me = FALSE;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12070
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12071 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12072 res = gtk_print_operation_run(op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, NULL, NULL);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12073 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12074 return (res == GTK_PRINT_OPERATION_RESULT_ERROR ? DW_ERROR_UNKNOWN : DW_ERROR_NONE);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12075 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12076
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12077 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12078 * Cancels the print job, typically called from a draw page callback.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12079 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12080 * print: Handle to the print object returned by dw_print_new().
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12081 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12082 void API dw_print_cancel(HPRINT print)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12083 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12084 int _dw_locked_by_me = FALSE;
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12085 GtkPrintOperation op = (GtkPrintOperation )print;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12086
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12087 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12088 gtk_print_operation_cancel(op);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12089 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12090 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12091
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12092 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	12093 * Returns a pointer to a static buffer which contains the
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12094 * current user directory. Or the root directory (C:\ on
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12095 * OS/2 and Windows).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12096 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12097 char *dw_user_dir(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12098 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12099 static char _user_dir[1024] = "";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12100
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12101 if(!_user_dir[0])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12102 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12103 char *home = getenv("HOME");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12104
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12105 if(home)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12106 strcpy(_user_dir, home);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12107 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12108 strcpy(_user_dir, "/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12109 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12110 return _user_dir;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12111 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12112
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12113 /*
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12114 * Returns a pointer to a static buffer which containes the
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12115 * private application data directory.
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12116 */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12117 char * API dw_app_dir(void)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12118 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12119 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12120 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12121
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12122 /*
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12123 * Sets the application ID used by this Dynamic Windows application instance.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12124 * Parameters:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12125 * appid: A string typically in the form: com.company.division.application
2088 94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12126 * appname: The application name used on Windows or NULL.
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12127 * Returns:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12128 * DW_ERROR_NONE after successfully setting the application ID.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12129 * DW_ERROR_UNKNOWN if unsupported on this system.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12130 * DW_ERROR_GENERAL if the application ID is not allowed.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12131 * Remarks:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12132 * This must be called before dw_init(). If dw_init() is called first
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12133 * it will create a unique ID in the form: org.dbsoft.dwindows.application
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12134 * or if the application name cannot be detected: org.dbsoft.dwindows.pid.#
2088 94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12135 * The appname is only required on Windows. If NULL is passed the detected
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12136 * application name will be used, but a prettier name may be desired.
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12137 */
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12138 int dw_app_id_set(const char appid, const char appname)
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12139 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12140 #if GLIB_CHECK_VERSION(2,28,0)
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12141 if(g_application_id_is_valid(appid))
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12142 {
2127 663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2118 diff changeset	12143 strncpy(_dw_app_id, appid, _DW_APP_ID_SIZE);
2333 d0f884083c63 GTK: Use appname in dw_app_id_set() to set g_set_application_name(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	12144 if(appname)
d0f884083c63 GTK: Use appname in dw_app_id_set() to set g_set_application_name(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2330 diff changeset	12145 g_set_application_name(appname);
2071 c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12146 return DW_ERROR_NONE;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12147 }
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12148 return DW_ERROR_GENERAL;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12149 #else
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12150 return DW_ERROR_UNKNOWN;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12151 #endif
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12152 }
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12153
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2066 diff changeset	12154 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12155 * Call a function from the window (widget)'s context.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12156 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12157 * handle: Window handle of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12158 * function: Function pointer to be called.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12159 * data: Pointer to the data to be passed to the function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12160 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12161 void dw_window_function(HWND handle, void function, void data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12162 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12163 void (* windowfunc)(void *);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12165 windowfunc = function;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12166
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12167 if(windowfunc)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12168 windowfunc(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12169 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12170
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12171 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12172 * Add a named user data item to a window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12173 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12174 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12175 * dataname: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12176 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12177 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12178 void dw_window_set_data(HWND window, const char dataname, void data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12179 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12180 HWND thiswindow = window;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12181 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12182
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12183 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12184 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12185
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12186 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12187 if(GTK_IS_SCROLLED_WINDOW(window))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12188 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12189 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12190 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12191 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12192 g_object_set_data(G_OBJECT(thiswindow), dataname, (gpointer)data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12193 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12194 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12195
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12196 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12197 * Gets a named user data item to a window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12198 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12199 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12200 * dataname: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12201 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12202 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12203 void dw_window_get_data(HWND window, const char dataname)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12204 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12205 HWND thiswindow = window;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12206 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12207 void *ret = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12209 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12210 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12211
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12212 DW_MUTEX_LOCK;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12213 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12214 {
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12215 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12216 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12217 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12218 ret = (void *)g_object_get_data(G_OBJECT(thiswindow), dataname);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12219 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12220 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12221 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12222
2532 457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12223 /*
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12224 * Compare two window handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12225 * Parameters:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12226 * window1: First window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12227 * window2: Second window handle to compare.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12228 * Returns:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12229 * TRUE if the windows are the same object, FALSE if not.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12230 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12231 int API dw_window_compare(HWND window1, HWND window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12232 {
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12233 /* If anything special is require to compare... do it
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12234 * here otherwise just compare the handles.
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12235 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12236 if(window1 && window2 && window1 == window2)
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12237 return TRUE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12238 return FALSE;
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12239 }
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2509 diff changeset	12240
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12241 /* Internal function to get the state of the timer before firing */
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12242 gboolean _dw_timer_func(gpointer data)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12243 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12244 void (sigfunc)(void data) = NULL;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12245 void *sdata;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	12246 char tmpbuf[31] = {0};
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12247 int *tag = data;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12248
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12249 if(tag)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12250 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12251 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12252 sigfunc = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12253 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12254 sdata = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12255 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12256 if(!sigfunc)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12257 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12258 if(tag)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12259 free(tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12260 return FALSE;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12261 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12262 sigfunc(sdata);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12263 return TRUE;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12264 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12265
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12266 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12267 * Add a callback to a timer event.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12268 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12269 * interval: Milliseconds to delay between calls.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12270 * sigfunc: The pointer to the function to be used as the callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12271 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12272 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12273 * Timer ID for use with dw_timer_disconnect(), 0 on error.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12274 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	12275 HTIMER API dw_timer_connect(int interval, void sigfunc, void data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12276 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12277 int *tag, _dw_locked_by_me = FALSE;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	12278 char tmpbuf[31] = {0};
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12279
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12280 tag = calloc(1, sizeof(int));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12281
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12282 DW_MUTEX_LOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12283 *tag = g_timeout_add(interval, (GSourceFunc)_dw_timer_func, (gpointer)tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12284 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12285 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, sigfunc);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12286 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12287 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, data);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12288 DW_MUTEX_UNLOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12289 return *tag;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12290 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12291
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12292 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12293 * Removes timer callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12294 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12295 * id: Timer ID returned by dw_timer_connect().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12296 */
2584 2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2532 diff changeset	12297 void API dw_timer_disconnect(HTIMER id)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12298 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12299 int _dw_locked_by_me = FALSE;
1306 dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1300 diff changeset	12300 char tmpbuf[31] = {0};
876 13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 875 diff changeset	12301
13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 875 diff changeset	12302 snprintf(tmpbuf, 30, "_dw_timer%d", id);
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12303 DW_MUTEX_LOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12304 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
876 13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 875 diff changeset	12305 snprintf(tmpbuf, 30, "_dw_timerdata%d", id);
875 e1afa43261d9 After thinking about it... probably need to get rid of the saved data to so we don't leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 874 diff changeset	12306 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
874 18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 861 diff changeset	12307 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12308 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12309
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12310 /* Get the actual signal window handle not the user window handle
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12311 * Should mimic the code in dw_signal_connect() below.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12312 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12313 static HWND _dw_find_signal_window(HWND window, const char *signame)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12314 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12315 HWND thiswindow = window;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12316
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12317 if(GTK_IS_SCROLLED_WINDOW(thiswindow))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12318 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	12319 else if(GTK_IS_SCALE(thiswindow) \|\| GTK_IS_SCROLLBAR(thiswindow) \|\| GTK_IS_SPIN_BUTTON(thiswindow))
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12320 thiswindow = (GtkWidget *)g_object_get_data(G_OBJECT(thiswindow), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12321 else if(GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12322 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12323 return thiswindow;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12324 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12326 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12327 * Add a callback to a window event.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12328 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12329 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12330 * signame: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12331 * sigfunc: The pointer to the function to be used as the callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12332 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12333 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12334 void dw_signal_connect(HWND window, const char signame, void sigfunc, void *data)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12335 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12336 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12337 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12338
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12339 /* Internal function to free any allocated signal data..
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12340 * and call any required function to free additional memory.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12341 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12342 static void _dw_signal_disconnect(gpointer data, GClosure *closure)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12343 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12344 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12345 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12346 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12347 void (discfunc)(HWND, void ) = params[1];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12348
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12349 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12350 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12351 DWSignalHandler work = _dw_get_signal_handler(data);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12352
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12353 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12354 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12355 discfunc(work.window, work.data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12356 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12357 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12358 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12359 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12360 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12361
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12362 #define _DW_INTERNAL_CALLBACK_PARAMS 4
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12363
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12364 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12365 * Add a callback to a window event with a closure callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12366 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12367 * window: Window handle of signal to be called back.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12368 * signame: A string pointer identifying which signal to be hooked.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12369 * sigfunc: The pointer to the function to be used as the callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12370 * discfunc: The pointer to the function called when this handler is removed.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12371 * data: User data to be passed to the handler function.
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12372 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12373 void dw_signal_connect_data(HWND window, const char signame, void sigfunc, void discfunc, void data)
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12374 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12375 void *thisfunc = _dw_findsigfunc(signame);
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12376 char thisname = (char )signame;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12377 HWND thiswindow = window;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12378 int sigid, _dw_locked_by_me = FALSE;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12379 void *params = calloc(_DW_INTERNAL_CALLBACK_PARAMS, sizeof(void ));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12380 gint cid;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12381
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12382 /* Save the disconnect function pointer */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12383 params[1] = discfunc;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12384
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12385 DW_MUTEX_LOCK;
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12386 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12387 /* Special case for handling notification signals, which aren't really signals */
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12388 if (G_IS_NOTIFICATION(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12389 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12390 char textbuf[101] = {0};
2132 42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2127 diff changeset	12391 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(thiswindow));
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12392 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(sigfunc));
2132 42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2127 diff changeset	12393 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(thiswindow));
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12394 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(data));
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12395 DW_MUTEX_UNLOCK;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12396 return;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12397 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12398 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12399 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12400 * If the window we are setting the signal on is a scrolled window we need to get
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12401 * the "real" widget type. thiswindow is the "real" widget type
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12402 */
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12403 if (GTK_IS_SCROLLED_WINDOW(thiswindow)
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12404 #ifdef USE_WEBKIT
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12405 && !(thiswindow = (HWND)_dw_html_web_view(thiswindow))
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12406 #endif
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12407 )
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12408 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12409 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12410 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12411
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12412 if (strcmp(signame, DW_SIGNAL_EXPOSE) == 0)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12413 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12414 thisname = "draw";
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12415 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12416 else if (GTK_IS_MENU_ITEM(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12417 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12418 thisname = "activate";
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12419 thisfunc = _dw_findsigfunc(thisname);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12421 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12422 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12423 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12424 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12425 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12426 cid = g_signal_connect_data(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12427 _dw_set_signal_handler_id(thiswindow, sigid, cid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12428
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12429 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12430 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12431 }
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	12432 else if ((GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0) \|\|
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	12433 (GTK_IS_COMBO_BOX(thiswindow) && strcmp(signame, DW_SIGNAL_LIST_SELECT) == 0))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12434 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12435 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12436
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12437 thisname = "changed";
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12438
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12439 sigid = _dw_set_signal_handler(widget, window, sigfunc, data, thisfunc, discfunc);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12440 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12441 params[2] = (void *)thiswindow;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12442 if(GTK_IS_TREE_VIEW(thiswindow))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12443 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12444 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12445 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	12446 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	12447 else
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	12448 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12449 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(_dw_combobox_select_event), params, _dw_signal_disconnect, 0);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12450 }
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12451 _dw_set_signal_handler_id(widget, sigid, cid);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12452
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12453 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12454 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12455 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12456 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_TREE_EXPAND) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12457 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12458 thisname = "row-expanded";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12459 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	12460 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12461 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12462 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_container_enter_event, discfunc);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12463 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12464 params[2] = (void *)thiswindow;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12465 cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_dw_container_enter_event), params, _dw_signal_disconnect, 0);
401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12466 _dw_set_signal_handler_id(thiswindow, sigid, cid);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12467
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12468 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12469
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12470 thisname = "button_press_event";
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12471 thisfunc = _dw_findsigfunc(DW_SIGNAL_ITEM_ENTER);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12472 }
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12473 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_COLUMN_CLICK) == 0)
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12474 {
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12475 /* We don't actually need a signal handler here... just need to assign the handler ID
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12476 * Since the handlers for the columns were already created in _dw_container_setup()
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12477 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12478 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_column_click_event, discfunc);
788 f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 787 diff changeset	12479 g_object_set_data(G_OBJECT(thiswindow), "_dw_column_click_id", GINT_TO_POINTER(sigid+1));
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12480 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12481 return;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12482 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12483 else if (strcmp(signame, DW_SIGNAL_SET_FOCUS) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12484 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12485 thisname = "focus-in-event";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12486 if (GTK_IS_COMBO_BOX(thiswindow))
789 8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	12487 thiswindow = gtk_bin_get_child(GTK_BIN(thiswindow));
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	12488 }
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12489 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12490 else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_CHANGED) == 0)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12491 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12492 #ifdef USE_WEBKIT2
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12493 thisname = "load-changed";
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12494 #else
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12495 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12496 params[0] = GINT_TO_POINTER(sigid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12497 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12498 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_STARTED);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12499 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-started", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12500 _dw_set_signal_handler_id(thiswindow, sigid, cid);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12501
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12502 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12503
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12504 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12505 params[0] = GINT_TO_POINTER(sigid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12506 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12507 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_LOADING);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12508 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-committed", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12509 _dw_set_signal_handler_id(thiswindow, sigid, cid);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12510
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12511 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12512 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_COMPLETE);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12513
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12514 thisname = "load-finished";
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12515 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12516 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12517 else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_RESULT) == 0)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12518 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12519 /* We don't actually need a signal handler here... just need to assign the handler ID
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12520 * Since the handler is created in dw_html_javasript_run()
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12521 */
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12522 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_html_result_event, discfunc);
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12523 g_object_set_data(G_OBJECT(thiswindow), "_dw_html_result_id", GINT_TO_POINTER(sigid+1));
2051 a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2040 diff changeset	12524 #ifndef USE_WEBKIT2
a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2040 diff changeset	12525 dw_debug("WARNING: DW_SIGNAL_HTML_RESULT will not be generated unless using webkit2gtk!\n");
a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2040 diff changeset	12526 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12527 DW_MUTEX_UNLOCK;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12528 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12529 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12530 #endif
789 8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	12531 #if 0
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12532 else if (strcmp(signame, DW_SIGNAL_LOSE_FOCUS) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12533 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12534 thisname = "focus-out-event";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12535 if(GTK_IS_COMBO_BOX(thiswindow))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12536 thiswindow = GTK_COMBO_BOX(thiswindow)->entry;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12537 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12538 #endif
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	12539 else if (GTK_IS_SCALE(thiswindow) \|\| GTK_IS_SCROLLBAR(thiswindow) \|\| GTK_IS_SPIN_BUTTON(thiswindow) )
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12540 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12541 thiswindow = (GtkWidget *)g_object_get_data(G_OBJECT(thiswindow), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12542 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12543 else if (GTK_IS_NOTEBOOK(thiswindow) && strcmp(signame, DW_SIGNAL_SWITCH_PAGE) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12544 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12545 thisname = "switch-page";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12546 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12548 if (!thisfunc \|\| !thiswindow)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12549 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12550 free(params);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12551 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12552 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12553 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12554
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12555 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12556 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12557 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12558 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12559 _dw_set_signal_handler_id(thiswindow, sigid, cid);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12560 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12561 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12562
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12563 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12564 * Removes callbacks for a given window with given name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12565 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12566 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12567 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12568 void dw_signal_disconnect_by_name(HWND window, const char *signame)
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12569 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12570 int z, count;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12571 void *thisfunc;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12572 int _dw_locked_by_me = FALSE;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12573 void *params = alloca(sizeof(void ) * 3);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12574
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12575 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12576 params[2] = _dw_find_signal_window(window, signame);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12577 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12578 thisfunc = _dw_findsigfunc(signame);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12579
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12580 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12581 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12582 DWSignalHandler sh;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12583
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12584 params[0] = GINT_TO_POINTER(z);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12585 sh = _dw_get_signal_handler(params);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12586
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12587 if(sh.intfunc == thisfunc)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12588 _dw_remove_signal_handler((HWND)params[2], z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12589 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12590 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12591 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12592
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12593 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12594 * Removes all callbacks for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12595 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12596 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12597 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12598 void dw_signal_disconnect_by_window(HWND window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12599 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12600 HWND thiswindow;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12601 int z, count;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12602 int _dw_locked_by_me = FALSE;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12603
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12604 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12605 thiswindow = _dw_find_signal_window(window, NULL);
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	12606 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12607
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12608 for(z=0;z<count;z++)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12609 _dw_remove_signal_handler(thiswindow, z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12610 g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12611 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12612 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12613
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12614 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12615 * Removes all callbacks for a given window with specified data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12616 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12617 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12618 * data: Pointer to the data to be compared against.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12619 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12620 void dw_signal_disconnect_by_data(HWND window, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12621 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12622 int z, count;
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12623 int _dw_locked_by_me = FALSE;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12624 void *params = alloca(sizeof(void ) * 3);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12625
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12626 DW_MUTEX_LOCK;
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12627 params[2] = _dw_find_signal_window(window, NULL);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12628 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12629
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12630 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12631 {
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12632 DWSignalHandler sh;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12633
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12634 params[0] = GINT_TO_POINTER(z);
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12635 sh = _dw_get_signal_handler(params);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12636
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12637 if(sh.data == data)
2626 401a3b9f21ba Massive continuation of code style standardization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2618 diff changeset	12638 _dw_remove_signal_handler((HWND)params[2], z);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12639 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12640 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12641 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12642
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12643 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12644 * Converts a UTF-8 encoded string into a wide string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12645 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12646 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12647 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12648 * Wide string that needs to be freed with dw_free()
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12649 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12650 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12651 wchar_t * API dw_utf8_to_wchar(const char *utf8string)
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12652 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12653 wchar_t retval = NULL, freeme;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12654
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12655 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12656 freeme = retval = (wchar_t *)g_utf8_to_ucs4(utf8string, -1, NULL, NULL, NULL);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12657 else if(sizeof(wchar_t) == sizeof(gunichar2))
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12658 freeme = retval = (wchar_t *)g_utf8_to_utf16(utf8string, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12659 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12660 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12661 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12662 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12663 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12664 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12665 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12666
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12667 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12668 * Converts a wide string into a UTF-8 encoded string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12669 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12670 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12671 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12672 * UTF-8 encoded string that needs to be freed with dw_free()
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12673 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12674 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12675 char * API dw_wchar_to_utf8(const wchar_t *wstring)
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12676 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12677 char retval = NULL, freeme;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12678
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12679 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12680 freeme = retval = g_ucs4_to_utf8((gunichar *)wstring, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12681 else if(sizeof(wchar_t) == sizeof(gunichar2))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12682 freeme = retval = g_utf16_to_utf8((gunichar2 *)wstring, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12683 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12684 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12685 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12686 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12687 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12688 return retval;
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12689 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12690
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12691 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12692 * Gets the state of the requested library feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12693 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12694 * feature: The requested feature for example DW_FEATURE_DARK_MODE
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12695 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12696 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12697 * DW_FEATURE_DISABLED if the feature is supported but disabled.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12698 * DW_FEATURE_ENABLED if the feature is supported and enabled.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12699 * Other value greater than 1, same as enabled but with extra info.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12700 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12701 int API dw_feature_get(DWFEATURE feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12702 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12703 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12704 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12705 #ifdef USE_WEBKIT
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12706 case DW_FEATURE_HTML:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12707 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12708 #ifdef USE_WEBKIT2
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12709 case DW_FEATURE_HTML_RESULT:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12710 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12711 #if GLIB_CHECK_VERSION(2,40,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12712 case DW_FEATURE_NOTIFICATION:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12713 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12714 #ifdef DW_INCLUDE_DEPRECATED
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12715 case DW_FEATURE_MDI:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12716 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12717 #if !GTK_CHECK_VERSION(3,14,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12718 case DW_FEATURE_CONTAINER_STRIPE:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12719 #endif
2284 3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2260 diff changeset	12720 case DW_FEATURE_TASK_BAR:
2127 663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2118 diff changeset	12721 case DW_FEATURE_UTF8_UNICODE:
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12722 case DW_FEATURE_MLE_WORD_WRAP:
2410 0286ac44d347 Add DW_FEATURE_TREE feature test, since iOS does not suppor tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	12723 case DW_FEATURE_TREE:
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12724 return DW_FEATURE_ENABLED;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12725 #ifdef GDK_WINDOWING_X11
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12726 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12727 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12728 int _dw_locked_by_me = FALSE, retval = DW_FEATURE_UNSUPPORTED;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12729 GdkDisplay *display;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12730
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12731 DW_MUTEX_LOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12732 display = gdk_display_get_default();
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12733
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12734 if(display && GDK_IS_X11_DISPLAY(display))
2509 eaac1317b851 GTK3: Fix incorrect return value. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2506 diff changeset	12735 retval = DW_FEATURE_ENABLED;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12736 DW_MUTEX_UNLOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12737 return retval;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12738 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12739 #endif
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12740 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12741 return DW_FEATURE_UNSUPPORTED;
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12742 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12743 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12744
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12745 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12746 * Sets the state of the requested library feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12747 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12748 * feature: The requested feature for example DW_FEATURE_DARK_MODE
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12749 * state: DW_FEATURE_DISABLED, DW_FEATURE_ENABLED or any value greater than 1.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12750 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12751 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12752 * DW_ERROR_NONE if the feature is supported and successfully configured.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12753 * DW_ERROR_GENERAL if the feature is supported but could not be configured.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12754 * Remarks:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12755 * These settings are typically used during dw_init() so issue before
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12756 * setting up the library with dw_init().
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12757 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12758 int API dw_feature_set(DWFEATURE feature, int state)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12759 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12760 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12761 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12762 /* These features are supported but not configurable */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12763 #ifdef USE_WEBKIT
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12764 case DW_FEATURE_HTML:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12765 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12766 #ifdef USE_WEBKIT2
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12767 case DW_FEATURE_HTML_RESULT:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12768 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12769 #if GLIB_CHECK_VERSION(2,40,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12770 case DW_FEATURE_NOTIFICATION:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12771 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12772 #ifdef DW_INCLUDE_DEPRECATED
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12773 case DW_FEATURE_MDI:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12774 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12775 #if !GTK_CHECK_VERSION(3,14,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12776 case DW_FEATURE_CONTAINER_STRIPE:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12777 #endif
2284 3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2260 diff changeset	12778 case DW_FEATURE_TASK_BAR:
2127 663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2118 diff changeset	12779 case DW_FEATURE_UTF8_UNICODE:
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12780 case DW_FEATURE_MLE_WORD_WRAP:
2410 0286ac44d347 Add DW_FEATURE_TREE feature test, since iOS does not suppor tree. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2365 diff changeset	12781 case DW_FEATURE_TREE:
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12782 return DW_ERROR_GENERAL;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12783 #ifdef GDK_WINDOWING_X11
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12784 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12785 {
2749 1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2744 diff changeset	12786 int _dw_locked_by_me = FALSE, retval = DW_FEATURE_UNSUPPORTED;
2506 fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12787 GdkDisplay *display;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12788
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12789 DW_MUTEX_LOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12790 display = gdk_display_get_default();
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12791
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12792 if(display && GDK_IS_X11_DISPLAY(display))
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12793 retval = DW_ERROR_GENERAL;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12794 DW_MUTEX_UNLOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12795 return retval;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12796 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2471 diff changeset	12797 #endif
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12798 /* These features are supported and configurable */
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12799 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12800 return DW_FEATURE_UNSUPPORTED;
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12801 }
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12802 }

Mercurial > dwindows

annotate gtk3/dw.c @ 2929:2ab97b349958