dwindows: gtk3/dw.c annotate

annotate gtk3/dw.c @ 2349:123e22827a82

GTK2/3: If the PID did not get returned set return to DW_ERROR_NONE. Use the new code on GTK2 as well.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 04 Mar 2021 12:32:56 +0000
parents	e3d2058ea96a
children	fad0821cb953

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 *
2237 3e9c5bff0a57 Update copyright and changelog to include Rich Edit change on Windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2211 diff changeset	6 * (C) 2000-2021 Brian Smith <brian@dbsoft.org>
1386 fd1de4e9e542 Updated the readme and comments in the source files bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1384 diff changeset	7 * (C) 2003-2011 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
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	47 #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	48 #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	49 #endif
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	50
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	51 #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	52 # 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	53 # 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	54 # 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	55 # 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	56 # 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	57 #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	58
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	59 /* 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	60 * 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	61 * 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	62 */
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	63 #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	64 #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	65 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	66 #endif
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	67 #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	68
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	69 /* 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	70 * 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	71 * 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	72 * 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	73 * 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	74 * 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	75 * 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	76 */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	77 GdkRGBA _colors[] =
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	78 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	79 { 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	80 { 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	81 { 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	82 { 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	83 { 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	84 { 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	85 { 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	86 { 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	87 { 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	88 { 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	89 { 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	90 { 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	91 { 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	92 { 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	93 { 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	94 { 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	95 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	96
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	97 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	98 * 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	99 */
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	100 #define NUM_EXTS 9
775 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 char *image_exts[NUM_EXTS] =
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 ".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	104 ".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	105 ".ico",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	106 ".icns",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	107 ".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	108 ".jpg",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	109 ".jpeg",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	110 ".tiff",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	111 ".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	112 };
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	114 #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	115 # 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	116 #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	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 #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	119 # 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	120 #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	121
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	122 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	123 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	124 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	125
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	126 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	127
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	128 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	129
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	130 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	131 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	132
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	133 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	134 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	135 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	136
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	137 #define DW_MUTEX_LOCK { if(pthread_self() != _dw_thread && !pthread_getspecific(_dw_mutex_key)) { _dw_gdk_threads_enter(); pthread_setspecific(_dw_mutex_key, (void *)1); _locked_by_me = TRUE; } }
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	138 #define DW_MUTEX_UNLOCK { if(pthread_self() != _dw_thread && _locked_by_me == TRUE) { _dw_gdk_threads_leave(); pthread_setspecific(_dw_mutex_key, NULL); _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	139
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	140 #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	141 #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	142 #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	143
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	144 #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	145 #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	146 #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	147 #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	148
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	149 /* Signal forwarder prototypes */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	150 static gint _button_press_event(GtkWidget widget, GdkEventButton event, 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	151 static gint _button_release_event(GtkWidget widget, GdkEventButton event, 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	152 static gint _motion_notify_event(GtkWidget widget, GdkEventMotion event, 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	153 static gint _delete_event(GtkWidget widget, GdkEvent event, 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	154 static gint _key_press_event(GtkWidget widget, GdkEventKey event, 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	155 static gint _generic_event(GtkWidget *widget, 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	156 static gint _configure_event(GtkWidget widget, GdkEventConfigure event, 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	157 static gint _activate_event(GtkWidget *widget, gpointer data);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	158 static gint _container_enter_event(GtkWidget widget, GdkEventAny event, gpointer data);
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	159 static gint _combobox_select_event(GtkWidget *widget, gpointer data);
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	160 static gint _expose_event(GtkWidget widget, cairo_t cr, 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	161 static gint _set_focus_event(GtkWindow window, GtkWidget widget, 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	162 static gint _tree_context_event(GtkWidget widget, GdkEventButton event, 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	163 static gint _value_changed_event(GtkWidget *widget, 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	164 static gint _tree_select_event(GtkTreeSelection *sel, 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	165 static gint _tree_expand_event(GtkTreeView treeview, GtkTreeIter arg1, GtkTreePath *arg2, 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	166 static gint _switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, gpointer data);
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	167 static gint _column_click_event(GtkWidget *widget, 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	168 static void _html_result_event(GObject object, GAsyncResult result, gpointer script_data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	169 #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	170 #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	171 static void _html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	172 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	173 static void _html_changed_event(WebKitWebView web_view, WebKitWebFrame frame, gpointer user_data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	174 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	175 #endif
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	176 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	177
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	178 GObject *_DWObject = NULL;
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	179 #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	180 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	181 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	182 #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	183 char *_DWDefaultFont = NULL;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	184 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	185
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	186 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	187 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	188 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	189 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	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 } SignalList;
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 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	194 {
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 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	196 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	197 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	198 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	199 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	200
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 } SignalHandler;
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
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	203 #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	204
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 /* A list of signal forwarders, to account for paramater differences. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	206 static SignalList SignalTranslate[SIGNALMAX] = {
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 { _configure_event, DW_SIGNAL_CONFIGURE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	208 { _key_press_event, DW_SIGNAL_KEY_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	209 { _button_press_event, DW_SIGNAL_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	210 { _button_release_event, DW_SIGNAL_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	211 { _motion_notify_event, DW_SIGNAL_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	212 { _delete_event, DW_SIGNAL_DELETE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	213 { _expose_event, DW_SIGNAL_EXPOSE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	214 { _activate_event, "activate" },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	215 { _generic_event, DW_SIGNAL_CLICKED },
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	216 { _container_enter_event, DW_SIGNAL_ITEM_ENTER },
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	217 { _tree_context_event, DW_SIGNAL_ITEM_CONTEXT },
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	218 { _combobox_select_event, DW_SIGNAL_LIST_SELECT },
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	219 { _tree_select_event, DW_SIGNAL_ITEM_SELECT },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	220 { _set_focus_event, DW_SIGNAL_SET_FOCUS },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	221 { _value_changed_event, DW_SIGNAL_VALUE_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	222 { _switch_page_event, DW_SIGNAL_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	223 { _column_click_event, DW_SIGNAL_COLUMN_CLICK },
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	224 { _tree_expand_event, DW_SIGNAL_TREE_EXPAND },
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	225 #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	226 { _html_changed_event, DW_SIGNAL_HTML_CHANGED },
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	227 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	228 { _generic_event, DW_SIGNAL_HTML_CHANGED },
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	229 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	230 { _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	231 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	233 /* 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	234 #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	235 #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	236 #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	237 #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	238 #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	239
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	240 #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	241 /* MDI Support Code */
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	242 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	243 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	244 #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	245 #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	246 #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	247
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	248 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	249 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	250 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	251 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	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 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	254 {
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 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	256 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	257 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	258 };
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 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	261 {
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 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	263 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	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 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	266 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	267 };
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
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 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	270 {
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 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	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 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	274 };
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 #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	277 #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	278 #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	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 #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	281 #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	282 #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	283 #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	284 #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	285 #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	286 #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	287
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 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	289
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 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	291 {
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 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	293
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 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	295 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	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 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	298 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	299 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	300 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	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 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	303 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	304
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 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	306 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	307
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 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	309 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	310 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	311 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	312 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	313
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	314 /* Callbacks */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	315 static gboolean move_child_callback(GtkWidget widget, GdkEvent event, 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	316 static gboolean resize_child_callback(GtkWidget widget, GdkEvent event, 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	317 static gboolean iconify_child_callback(GtkWidget widget, GdkEvent event, 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	318 static gboolean maximize_child_callback(GtkWidget widget, GdkEvent event, 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	319 static gboolean kill_child_callback(GtkWidget widget, GdkEvent event, 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	320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	321 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	322 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	323 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	324
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 static GtkMdiChild get_child(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	326
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 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	328 {
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 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	330
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 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	332 {
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 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	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 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	337 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	338 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	339 (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	340 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	341 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	342 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	343 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	344 (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	345 };
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
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 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	348 }
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 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	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 /* 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	353 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	354
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 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	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 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	358 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	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 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	361 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	362
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 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	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->realize = gtk_mdi_realize;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	366 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	367 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	368 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	369 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	370
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	371 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	372 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	373 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	374 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	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
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 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	378 {
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 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	380 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	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
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 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	384 {
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 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	386 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	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 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	389 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	390 _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	391
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 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	393 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	394
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	395 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	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 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	398
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	399 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	400 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	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 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	403 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	404 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	405 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	406 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	407
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	408 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	409 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	410 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	411 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	412
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	413 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	414 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	415 #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	416 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	417 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	418 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	419 #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	420 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	421 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	422 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	423 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	424 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	425
775 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 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	427 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	428 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	429 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	430 }
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
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	432 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	433
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	434 _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	435 _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	436 _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	437 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	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 (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	440 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	441 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	442 _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	443 #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	444 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	445 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	446 #else
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	447 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	448 #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	449
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	450 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	451 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	452 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	453
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 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465 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	466 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	467
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	468
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	469 /* 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	470 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	471 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	472 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	473 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	474 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	475
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	476 /* 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	477 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	478 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	479 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	480
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	481 /* 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	482 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	483
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_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	485
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	486 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	487 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	488 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	489 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	490 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	491 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	492 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	493 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	494 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	495
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 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	497 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	498
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 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	500 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	501 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	502 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	503 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	504 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	505 {
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 (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	507 }
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
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	509 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	510 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	511 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	512 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	513 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	514 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	515
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 g_signal_connect (G_OBJECT (top_event_box), "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	517 G_CALLBACK (move_child_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	518 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	519 g_signal_connect (G_OBJECT (bottom_event_box), "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	520 G_CALLBACK (resize_child_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	521 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	522 g_signal_connect (G_OBJECT (button[0]), "button_press_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	523 G_CALLBACK (iconify_child_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	524 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	525 g_signal_connect (G_OBJECT (button[1]), "button_press_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	526 G_CALLBACK (maximize_child_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	527 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	528 g_signal_connect (G_OBJECT (button[2]), "button_press_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	529 G_CALLBACK (kill_child_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	530 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	531 }
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
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 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	534 {
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 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	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 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	538 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	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 child = get_child(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	541 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	542
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 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	544 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	545 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	546 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	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
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 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	550 {
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 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	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 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	554 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	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 child = get_child(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	557 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	558
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 *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	560 *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	561 }
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
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 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	564 {
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 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	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 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	568 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	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 child = get_child (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	571 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	572
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 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	574 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	575 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	576 }
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 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	579 {
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 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	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 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	583 child = get_child (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	584 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	585 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	588 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	589 {
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 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	591 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	592 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	593 GdkWindow *thiswindow;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	594 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	595
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 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	597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	598 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	599 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	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 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	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 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	604 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	605 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	606 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	607 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	608 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	609 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	610 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	611 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	612 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	613 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	614 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	615
775 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 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	617 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	618 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	619
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	620 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	621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	622
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	623 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	624 {
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 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	626 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	627 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	628 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	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 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	631 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	632
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	633 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	634 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	635 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	636 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	637 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	638
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 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	640 {
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	641 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	642 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	643 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	644 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	645
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 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	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 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	649 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	650 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	651 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	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 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	654 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	655
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 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	657 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	658 {
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 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	660 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	661
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 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	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 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	665 }
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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	669 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	670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	671 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	672 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	673 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	674 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	675 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	676
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 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	678
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 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	680
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 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	682 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	683 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	684 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	685 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	686 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	687
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
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 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	690 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	691 {
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 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	693 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	694
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 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	696 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	697 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	698 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	699 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	700 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	701 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	702 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	703 {
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 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	705 {
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 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	707 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	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 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	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->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->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 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	714 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	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.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	717 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	718 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	719 }
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 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	721 {
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 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	723 {
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 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	725 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	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 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	728 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	729 }
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 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	731 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	732 {
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 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	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 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	736 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	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 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	739 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	740 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	741 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	742 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	743 }
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 }
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 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	746 }
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 }
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
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	750 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	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 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	753 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	754 GtkMdi *mdi;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	755 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	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 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	758 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	759 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	760
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 mdi = GTK_MDI (widget);
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	762
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	763 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	764 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	765 GtkAllocation allocation;
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	766
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	767 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	768 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	769 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	770
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	771 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	772 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	773 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	774 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	775 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	776 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	777 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	778 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	779 }
775 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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	781 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	782 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783 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	784 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	785 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	786 }
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 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	789 {
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 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	791 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	792 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	793
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 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	795
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 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	797 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	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 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	800 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	801 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	802
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 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	804 }
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
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 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	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 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	809 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	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 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	812 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	813 }
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
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 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	816 {
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 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	818 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	819 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	820
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 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	822
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 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	824
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 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	826 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	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 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	829 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	830
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 (*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	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 }
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
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 static gboolean move_child_callback(GtkWidget widget, GdkEvent event, 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	836 {
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 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	838 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	839
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	840 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	841 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	842
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 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	844 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	845
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
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 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	848 {
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 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	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 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	852 }
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 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	854 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	855 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	856 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	857 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	858 #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	859 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	860 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	861 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	862 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	863 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	864 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	865 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	866 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	867 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	868 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	869 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	870 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	871 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	872 #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	873 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	874
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 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	876
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	877 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	878 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	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 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	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 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	883 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	884 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	885
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 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	887 {
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 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	889
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	890 #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	891 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	892 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	893 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	894 #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	895 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	896
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	897 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	898 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	899
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 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	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 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	903
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 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	905 {
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 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	907
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 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	909 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	910
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	911 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	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
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 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	915 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	916
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 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	919 }
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 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	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 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	923 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	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
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 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	927 }
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
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 static gboolean resize_child_callback(GtkWidget widget, GdkEvent event, 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	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 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	932 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	933
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	934 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	935 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	936
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 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	938 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	939
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 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	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 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	943 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	944 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	945 #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	946 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	947 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	948 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	949 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	950 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	951 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	952 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	953 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	954 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	955 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	956 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	957 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	958 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	959 #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	960 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	961
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 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	963 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	964 {
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 GtkAllocation allocation;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	966
775 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 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	968 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	969 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	970 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	971 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	972 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	973 }
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
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 }
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 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	977
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 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	979 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	980 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	981
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 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	983 {
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 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	985 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	986
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	987 #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	988 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	989 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	990 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	991 #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	992 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	993
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	994 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	995 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	996 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	997
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 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	999 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	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	1001 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	1002 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	1003 }
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 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	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 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	1007 {
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 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	1009 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	1010 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	1011
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 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	1013 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	1014
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1015 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	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 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	1018 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	1019 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	1020
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 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	1022 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	1023
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 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	1025 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	1026 }
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 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	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 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	1030 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	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
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 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	1034 }
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
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 static gboolean iconify_child_callback (GtkWidget widget, GdkEvent event, 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	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 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	1039 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	1040 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	1041 {
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 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	1043 }
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 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	1045 {
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 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	1047 }
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 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	1049 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	1050 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	1051 }
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 static gboolean maximize_child_callback (GtkWidget widget, GdkEvent event, 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	1054 {
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 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	1056 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	1057 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	1058 {
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 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	1060 }
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 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	1062 {
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 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	1064 }
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 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	1066 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	1067 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	1068 }
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 static gboolean kill_child_callback (GtkWidget widget, GdkEvent event, 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	1071 {
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 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	1073 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	1074
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1075 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	1076 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	1077
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 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	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 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	1081 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	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
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 static GtkMdiChild get_child (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	1085 {
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 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	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 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	1089 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	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 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	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 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	1094 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	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 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	1097 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	1098 }
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
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 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	1101 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	1102 #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	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 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	1105 {
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 #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	1107 /* 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	1108 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	1109
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 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	1111 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	1112 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1113 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	1114 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	1115 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1116 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	1117
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1118 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	1119 #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	1120 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	1121 #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	1122 }
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
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 /* Finds the translation function for a given signal name */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	1125 static void _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	1126 {
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 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	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 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	1130 {
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 if(strcasecmp(signame, SignalTranslate[z].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	1132 return SignalTranslate[z].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	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 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	1135 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1136
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1137 static SignalHandler _get_signal_handler(gpointer data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1138 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1139 SignalHandler 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	1140
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1141 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1142 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1143 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1144 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	1145 GtkWidget widget = (GtkWidget )params[2];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1146 char text[100];
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 sprintf(text, "_dw_sigwindow%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1149 sh.window = (HWND)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	1150 sprintf(text, "_dw_sigfunc%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1151 sh.func = (void *)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	1152 sprintf(text, "_dw_intfunc%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1153 sh.intfunc = (void *)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	1154 sprintf(text, "_dw_sigdata%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1155 sh.data = 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	1156 sprintf(text, "_dw_sigcid%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1157 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	1158 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1159 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	1160 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1162 static void _remove_signal_handler(GtkWidget *widget, int 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	1163 {
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 char text[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	1165 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	1166
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1167 sprintf(text, "_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	1168 cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), 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	1169 g_signal_handler_disconnect(G_OBJECT(widget), 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	1170 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	1171 sprintf(text, "_dw_sigwindow%d", 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	1172 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	1173 sprintf(text, "_dw_sigfunc%d", 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	1174 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	1175 sprintf(text, "_dw_intfunc%d", 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	1176 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	1177 sprintf(text, "_dw_sigdata%d", 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	1178 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	1179 }
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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1181 static int _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	1182 {
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	1183 int counter = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_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	1184 char text[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	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 sprintf(text, "_dw_sigwindow%d", 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	1187 g_object_set_data(G_OBJECT(widget), text, (gpointer)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	1188 sprintf(text, "_dw_sigfunc%d", 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	1189 g_object_set_data(G_OBJECT(widget), text, (gpointer)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	1190 sprintf(text, "_dw_intfunc%d", 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	1191 g_object_set_data(G_OBJECT(widget), text, (gpointer)intfunc);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1192 sprintf(text, "_dw_discfunc%d", counter);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1193 g_object_set_data(G_OBJECT(widget), text, (gpointer)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	1194 sprintf(text, "_dw_sigdata%d", 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	1195 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	1196
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 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	1198 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	1199
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1200 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	1201 }
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 static void _set_signal_handler_id(GtkWidget *widget, int counter, 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	1204 {
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 char text[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	1206
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 sprintf(text, "_dw_sigcid%d", 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	1208 g_object_set_data(G_OBJECT(widget), text, GINT_TO_POINTER(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	1209 }
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
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1211 static void _html_result_event(GObject object, GAsyncResult result, gpointer script_data)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1212 {
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1213 #if USE_WEBKIT2
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1214 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	1215 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	1216 #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	1217 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	1218 #else
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1219 JSValueRef value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1220 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	1221 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1222 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	1223 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	1224 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	1225 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	1226
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1227 _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	1228 if(handlerdata)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1229 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1230 SignalHandler work;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1231 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	1232
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1233 work = _get_signal_handler(params);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1234
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1235 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	1236 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1237 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	1238 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	1239 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1240 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1241
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1242 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	1243 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1244 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	1245 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	1246 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	1247 _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	1248 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1249 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1250
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1251 #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	1252 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	1253 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	1254 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1255 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	1256 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	1257 #else
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1258 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	1259 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	1260 if (JSValueIsString(context, value))
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1261 {
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1262 JSStringRef js_str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1263 gchar *str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1264 gsize str_length;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1265
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1266 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	1267 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	1268 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	1269 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	1270 JSStringRelease(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1271 #endif
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1272
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1273 if(htmlresultfunc)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1274 {
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1275 #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	1276 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	1277 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	1278 else
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1279 #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	1280 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	1281 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1282 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	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 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	1285 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	1286 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	1287 _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	1288 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1289 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1290
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1291 #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	1292 #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	1293 static void _html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1294 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1295 SignalHandler work = _get_signal_handler(data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1296 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	1297 int status = 0;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1298
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1299 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	1300 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	1301 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	1302 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1303 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	1304 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	1305 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1306 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	1307 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	1308 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1309 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	1310 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	1311 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1312 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1313 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	1314 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1315 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	1316
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1317 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	1318 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1319 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1320 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1321 static void _html_changed_event(WebKitWebView web_view, WebKitWebFrame frame, gpointer data)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1322 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1323 SignalHandler work = _get_signal_handler(data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1324 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	1325 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	1326 void **params = data;
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 if(params)
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	1329 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	1330
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1331 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	1332 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1333 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	1334
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1335 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	1336 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1337 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1338 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1339 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1340
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1341 static gint _set_focus_event(GtkWindow window, GtkWidget widget, 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	1342 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1343 SignalHandler work = _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	1344 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	1345
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1346 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	1347 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1348 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	1349
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1350 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	1351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1352 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	1353 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1354
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 static gint _button_press_event(GtkWidget widget, GdkEventButton event, 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	1356 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1357 SignalHandler work = _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	1358 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	1359
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 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	1361 {
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 int (buttonfunc)(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	1363 int mybutton = event->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	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 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	1366 mybutton = 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	1367 else if(event->button == 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	1368 mybutton = 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	1369
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 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	1371 }
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 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	1373 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1374
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 static gint _button_release_event(GtkWidget widget, GdkEventButton event, 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	1376 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1377 SignalHandler work = _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	1378 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	1379
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 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	1381 {
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 int (buttonfunc)(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	1383 int mybutton = event->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	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 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	1386 mybutton = 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	1387 else if(event->button == 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	1388 mybutton = 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	1389
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 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	1391 }
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 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	1393 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1394
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 static gint _motion_notify_event(GtkWidget widget, GdkEventMotion event, 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	1396 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1397 SignalHandler work = _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	1398 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	1399
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 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	1401 {
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 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	1403 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	1404 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	1405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1406 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	1407 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	1408 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	1409 {
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 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	1411 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	1412 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	1413 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1415 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	1416 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	1417 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	1418 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	1419 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	1420 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	1421
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 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	1423 }
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 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	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
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 static gint _delete_event(GtkWidget widget, GdkEvent event, 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	1428 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1429 SignalHandler work = _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	1430 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	1431
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 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	1433 {
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 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	1435
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 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	1437 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1438 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	1439 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1440
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 static gint _key_press_event(GtkWidget widget, GdkEventKey event, 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	1442 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1443 SignalHandler work = _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	1444 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	1445
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 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	1447 {
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1448 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	1449 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	1450 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	1451
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1452 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	1453
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1454 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	1455 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	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 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	1458 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1459
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1460 static gint _generic_event(GtkWidget *widget, 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	1461 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1462 SignalHandler work = _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	1463 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	1464
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 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	1466 {
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 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	1468
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 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	1470 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1471 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	1472 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1473
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 static gint _activate_event(GtkWidget *widget, 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	1475 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1476 SignalHandler work = _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	1477 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	1478
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 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	1480 {
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 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	1482
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	1483 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	1484 _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	1485 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1486 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	1487 }
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
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 static gint _configure_event(GtkWidget widget, GdkEventConfigure event, 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	1490 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1491 SignalHandler work = _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	1492 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	1493
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1494 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	1495 {
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 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	1497
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 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	1499 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1500 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	1501 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1502
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1503 static gint _expose_event(GtkWidget widget, cairo_t cr, 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	1504 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1505 SignalHandler work = _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	1506 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	1507
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 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	1509 {
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 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	1511 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	1512
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1513 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	1514 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	1515 exp.height = gtk_widget_get_allocated_height(widget);
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	1516 g_object_set_data(G_OBJECT(work.window), "_dw_expose", GINT_TO_POINTER(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	1517 retval = exposefunc(work.window, &exp, work.data);
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	1518 g_object_set_data(G_OBJECT(work.window), "_dw_expose", 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	1519 }
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 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	1521 }
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
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	1523 static gint _combobox_select_event(GtkWidget *widget, 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	1524 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1525 SignalHandler work = _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	1526 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	1527
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1528 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	1529 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	1530
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	1531 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	1532 {
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	1533 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	1534
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	1535 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	1536 {
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	1537 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	1538 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1539
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1540 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	1541
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1542 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	1543 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1544 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	1545
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1546 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	1547 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1548 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	1549
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1550 if(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1551 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1552 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	1553
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1554 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	1555 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1556 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	1557 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1558 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1559
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1560 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	1561 }
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	1562 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1563 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	1564 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1565
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1566 #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	1567 #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	1568
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1569 static gint _tree_context_event(GtkWidget widget, GdkEventButton event, 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	1570 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1571 SignalHandler work = _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	1572 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	1573
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1574 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	1575 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1576 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	1577 {
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 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	1579 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	1580 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	1581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1582 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	1583 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1584 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	1585 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	1586 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	1587
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1588 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	1589 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	1590 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1591 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	1592 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1593 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	1594 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1595 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1596 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1597 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, -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	1598 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1599 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1600 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1601 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1602 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1603
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1604 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	1605 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1606 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1607 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1608
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1609 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	1610 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1611 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	1612 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1613 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	1614 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1615 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1616 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1617 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, -1);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1618 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1619 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1620 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1621 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1622 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1623 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1624
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1625 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	1626 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1627 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	1628 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1629 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1630 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	1631 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1632
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1633 static gint _tree_select_event(GtkTreeSelection *sel, 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	1634 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1635 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	1636 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	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 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	1639 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1640 SignalHandler work = _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	1641
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 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	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 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	1645 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	1646 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	1647 void *itemdata = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1648 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	1649
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1650 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	1651 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1652 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	1653 return TRUE;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1654 }
775 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
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1656 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	1657 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	1658 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1659 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	1660 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1661 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	1662 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	1663 }
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	1664 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	1665 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1666 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	1667 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	1668 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1669 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1670 {
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	1671 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	1672
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	1673 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	1674 {
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	1675 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	1676
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	1677 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	1678 {
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 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	1680
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 = 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	1682 }
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	1683 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	1684 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1685 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1686 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1687 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1688 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1689 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1690
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1691 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	1692 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1693 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1694 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1695
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1696 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	1697 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1698 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	1699 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1700 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	1701 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	1702 }
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	1703 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	1704 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1705 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	1706 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	1707 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1708 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1709 {
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	1710 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	1711
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	1712 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	1713 {
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	1714 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	1715
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	1716 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	1717 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1718 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1719 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1720 gtk_tree_path_free(path);
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 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1723 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1724 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	1725 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1726 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1727 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	1728 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1729
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1730 static gint _tree_expand_event(GtkTreeView widget, GtkTreeIter iter, GtkTreePath *path, 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	1731 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1732 SignalHandler work = _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	1733 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	1734
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1735 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	1736 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1737 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	1738 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	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 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	1741 }
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
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1743 static gint _container_enter_event(GtkWidget widget, GdkEventAny 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	1744 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1745 SignalHandler work = _get_signal_handler(data);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1746 GdkEventKey keyevent = (GdkEventKey )event;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1747 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	1748 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	1749
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 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	1751 {
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1752 /* 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	1753 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	1754 (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	1755 {
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1756 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	1757 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	1758 void *data = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1759
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1760 /* 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	1761 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	1762 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1763 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	1764 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1765
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1766 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1767 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	1768 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1769 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1770 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	1771
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1772 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	1773 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1774 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1775 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1776
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1777 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	1778 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1779 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	1780 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1781 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	1782 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	1783 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1784 g_free(text);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1785 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1786 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1787 gtk_tree_path_free(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 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1790 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1791 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1792 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	1793 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1794
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1795 /* Return the logical page id from the physical 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	1796 int _get_logical_page(HWND handle, unsigned long 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	1797 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1798 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	1799 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	1800 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	1801
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1802 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	1803 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1804 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	1805 {
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 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	1807 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1810 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	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
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
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 static gint _switch_page_event(GtkNotebook notebook, GtkWidget page, guint page_num, 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	1815 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1816 SignalHandler work = _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	1817 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	1818
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 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	1820 {
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 int (switchpagefunc)(HWND, unsigned long, 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	1822 retval = switchpagefunc(work.window, _get_logical_page(GTK_WIDGET(notebook), page_num), 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	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 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	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
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1827 static gint _column_click_event(GtkWidget *widget, gpointer data)
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1828 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1829 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	1830 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	1831
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1832 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1833 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1834 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	1835 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	1836
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1837 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1838 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1839 SignalHandler 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	1840
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1841 params[0] = GINT_TO_POINTER(handlerdata-1);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1842 work = _get_signal_handler(params);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1843
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1844 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1845 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1846 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	1847 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	1848 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	1849 }
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	1850 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1851 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1852 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	1853 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1854
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1855 static int _round_value(gfloat 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	1856 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1857 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	1858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1859 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	1860 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	1861
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1862 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	1863 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1864
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1865 static gint _value_changed_event(GtkWidget *widget, gpointer data)
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1866 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1867 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	1868 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	1869 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	1870
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1871 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	1872 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	1873
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1874 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	1875 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	1876 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	1877
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1878 max = _round_value(gtk_adjustment_get_upper(adjustment));
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1879 val = _round_value(gtk_adjustment_get_value(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	1880
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1881 if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event"))
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1882 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1883
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1884 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	1885 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1886 SignalHandler work = _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	1887
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1888 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	1889 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1890 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	1891
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	1892 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	1893 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	1894 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	1895 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	1896 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1897 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1898 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	1899 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1900
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 static gint _default_key_press_event(GtkWidget widget, GdkEventKey event, 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	1902 {
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 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	1904
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 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	1906 {
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 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	1908 {
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 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	1910 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	1911 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	1912 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1915 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	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
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1918 #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	1919 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	1920 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1921 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	1922 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	1923 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	1924 }
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1925 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1926
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1927 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	1928 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1929 #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	1930 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	1931 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	1932 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	1933 #else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1934 return NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1935 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1936 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1937
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1938 static GdkPixbuf _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	1939 {
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1940 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	1941 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	1942
1289 5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1943 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1944 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1945 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1946
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1947 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	1948 icon_pixbuf = icon;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1949 else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1950 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	1951
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1952 #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	1953 if(!icon_pixbuf)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1954 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1955 char *data = NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1956 int z;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1957
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1958 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	1959 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1960 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	1961 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1962 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	1963 break;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1964 }
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
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1967 if(data)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1968 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	1969 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1970 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1971 if(userwidth)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1972 *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	1973 if(userheight)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1974 *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	1975
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1976 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	1977 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1978
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1979 #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	1980 /* 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	1981 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	1982 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1983 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	1984 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	1985 void *data;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1986
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	1987 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	1988 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	1989 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	1990 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	1991 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	1992 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	1993
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1994 if(func)
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	1995 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	1996 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1997 #endif
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1998
2197 b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	1999 #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	2000 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	2001 {
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2002 /* 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	2003 * 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	2004 * 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	2005 */
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2006 }
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2007 #endif
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2008
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2009 #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	2010 #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	2011 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	2012 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2013 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	2014 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	2015
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2016 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	2017 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2018 _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	2019 _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	2020 _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	2021 }
2205 a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2022 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	2023 }
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2024 #endif
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2025
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2026 /*
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2027 * Initializes the Dynamic Windows engine.
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2028 * Parameters:
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2029 * newthread: True if this is the only thread.
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2030 * False if there is already a message loop running.
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2031 */
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2032 int dw_init(int newthread, int argc, char *argv[])
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2033 {
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2034 /* Setup the private data directory */
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2035 if(argc > 0 && argv[0])
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2036 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2037 char *pathcopy = strdup(argv[0]);
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2038 char *pos = strrchr(pathcopy, '/');
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2039 char *binname = pathcopy;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2040
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2041 /* If we have a / then...
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2042 * 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	2043 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2044 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2045 {
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2046 binname = pos + 1;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2047 *pos = 0;
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2048 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2049
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2050 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2051 {
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2052 char *binpos = strstr(pathcopy, "/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	2053
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2054 if(binpos)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2055 strncpy(_dw_share_path, pathcopy, (size_t)(binpos - pathcopy));
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2056 else
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2057 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2058 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2059 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	2060 #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	2061 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	2062 {
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	2063 /* 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	2064 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	2065 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2066 #endif
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2067 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2068 if(pathcopy)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2069 free(pathcopy);
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2070 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2071 /* 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	2072 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	2073 _dw_share_path[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	2074
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2075 #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	2076 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	2077 #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	2078
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2079 /* 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	2080 _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	2081 _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	2082 _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	2083
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2084 _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	2085
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2086 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	2087
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	2088 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	2089 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	2090 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	2091
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	2092 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2093
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	2094 /* 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	2095 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2096
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2097 #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	2098 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	2099 {
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	2100 /* 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	2101 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	2102 }
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2103
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2104 /* 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	2105 * 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	2106 * 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	2107 */
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	2108 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_FLAGS_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	2109 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	2110 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2111 #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	2112 /* 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	2113 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	2114
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2115 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	2116 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	2117 #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	2118 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	2119 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	2120 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	2121 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2122 #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	2123 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	2124 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2125
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2126 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2127 * 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	2128 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2129 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	2130 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2131 _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	2132 _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	2133 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	2134 _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	2135 _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	2136 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2137
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2138 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2139 * 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	2140 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2141 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	2142 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2143 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	2144 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2145
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2146 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2147 * 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	2148 * 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	2149 * 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	2150 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2151 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	2152 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2153 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	2154 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	2155
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2156 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	2157
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2158 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	2159 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2160 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	2161
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 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	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 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	2165 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2166 int _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	2167
775 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 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	2169 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2170 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	2171 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2172 _dw_gdk_threads_enter();
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2173 pthread_setspecific(_dw_mutex_key, (void *)1);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2174 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2175 }
775 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 _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	2177 }
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2178 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	2179 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	2180 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	2181 _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	2182 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	2183 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184 _dw_thread = orig;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2185 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2186 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2187 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	2188 _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	2189 }
775 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 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	2192 }
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 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	2195 _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	2196 }
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 /*
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 * 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	2200 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2201 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	2202 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2203 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	2204 pthread_t curr = pthread_self();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2205 int _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	2206
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2207 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	2208 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2209 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	2210 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2211 _dw_gdk_threads_enter();
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2212 pthread_setspecific(_dw_mutex_key, (void *)1);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2213 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2214 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2215 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2216 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2217 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	2218 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2219 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2220 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2221 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	2222 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2223 _dw_thread = orig;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2224 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2225 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2226 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	2227 _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	2228 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2229 }
775 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 /*
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 * 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	2234 * 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	2235 * 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	2236 * 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	2237 */
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 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	2239 {
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 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	2241 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2242
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2243 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2244 * 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	2245 * 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	2246 * 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	2247 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2248 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	2249 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2250 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	2251
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2252 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	2253 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2254 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	2255 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	2256 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	2257 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	2258 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	2259 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	2260 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2261 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	2262 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2263
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2264 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2265 * 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	2266 * 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	2267 * 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	2268 * 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	2269 * 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	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 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	2272 {
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 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	2274 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	2275 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	2276 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	2277 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	2278 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	2279 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	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 /*
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 * 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	2284 * 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	2285 * 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	2286 * 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	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 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	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 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	2291 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	2292
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2293 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	2294 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	2295
775 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 /* _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	2297 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	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 _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	2300 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	2301 _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	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
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 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	2305 {
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->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	2307 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	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 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	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->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	2312 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	2313 }
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
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 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	2316 {
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 _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	2318 _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	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 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	2322 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	2323 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	2324 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	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
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 /*
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	2328 * 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	2329 * 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	2330 * 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	2331 * ...: 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	2332 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2333 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	2334 {
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	2335 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	2336 char outbuf[1025] = {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	2337
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	2338 va_start(args, 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	2339 vsnprintf(outbuf, 1024, format, 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	2340 va_end(args);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2341
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	2342 fprintf(stderr, "%s", outbuf);
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	2343 }
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	2344
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	2345 /*
775 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 * 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	2347 * 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	2348 * 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	2349 * 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	2350 * 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	2351 * ...: 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	2352 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2353 int dw_messagebox(const char title, int flags, const char format, ...)
775 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 {
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2355 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	2356 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	2357 GtkWidget *dialog;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2358 int response, _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	2359 va_list 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	2360 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	2361
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 va_start(args, 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	2363 vsnprintf(outbuf, 1024, format, 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	2364 va_end(args);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	2365
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2366 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	2367 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	2368 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	2369 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	2370 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	2371 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	2372 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	2373 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	2374
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2375 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	2376 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	2377 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	2378 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	2379
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2380 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	2381 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	2382 #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	2383 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	2384 #endif
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2385 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	2386 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	2387 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	2388 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	2389 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	2390 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	2391 DW_MUTEX_UNLOCK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2392 switch(response)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2393 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2394 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	2395 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	2396 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	2397 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	2398 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	2399 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	2400 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	2401 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	2402 default:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2403 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2404 /* 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	2405 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	2406 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	2407 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	2408 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	2409 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2410 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2411 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	2412 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2413
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2415 * 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	2416 * 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	2417 * 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	2418 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2419 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	2420 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2421 int _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	2422 #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	2423 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	2424 #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	2425
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2426 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	2427 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	2428
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2429 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	2430 #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	2431 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	2432 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2433 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	2434 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2435 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2436 #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	2437 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2438 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	2439 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2440 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	2441 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	2442 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2443
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2444 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2445 * 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	2446 * 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	2447 * 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	2448 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2449 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	2450 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2451 int _locked_by_me = 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	2452
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2453 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	2454 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	2455
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2456 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	2457 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	2458 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	2459 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	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 * 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	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 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	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_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	2468 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2469 int _locked_by_me = 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	2470
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 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	2472 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	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 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	2475 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	2476 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	2477 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	2478 }
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
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 * 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	2482 * 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	2483 * 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	2484 */
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 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	2486 {
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 int _locked_by_me = 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	2488 GtkWidget *defaultitem;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2489 #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	2490 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2491 #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	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 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	2494 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	2495
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 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	2497 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	2498 #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	2499 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	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 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	2502 }
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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2504 #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	2505 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2506 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	2507 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	2508 {
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	2509 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	2510 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	2511
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2512 /* 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	2513 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	2514 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2515 /* 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	2516 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	2517 /* 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	2518 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	2519 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	2520 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2521
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2522 /* 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	2523 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	2524 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2525 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	2526 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	2527
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2528 /* 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	2529 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	2530 /* 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	2531 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	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
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2534 gdk_window_raise(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2535 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	2536 gdk_window_show(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2537 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	2538 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2539 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	2540 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	2541 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	2542 }
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 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	2544 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	2545 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2546
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 /*
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 * 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	2549 * 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	2550 * 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	2551 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2552 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	2553 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2554 int _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	2555 #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	2556 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	2557 #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	2558
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 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	2560 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	2561
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2562 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	2563 #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	2564 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	2565 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2566 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	2567 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2568 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2569 #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	2570 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	2571 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	2572 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	2573 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2574
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2575 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2576 * 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	2577 * 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	2578 * 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	2579 */
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 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	2581 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2582 int _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	2583 #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	2584 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	2585 #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	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 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	2588 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	2589
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 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	2591 #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	2592 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	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 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	2595 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2596 #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	2597 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	2598 {
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	2599 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	2600 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	2601
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	2602 /* 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	2603 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	2604 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	2605
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2606 /* 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	2607 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	2608 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2609 /* 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	2610 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	2611 #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	2612 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	2613 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	2614
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2615 /* 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	2616 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	2617 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2618 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	2619 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2620 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	2621 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2622 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	2623 handle2 = NULL;
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2624 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2625 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2626 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2627 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2628 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2629 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2630 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	2631 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2632 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	2633 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2634 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	2635 handle2 = NULL;
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2636 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2637 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2638 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2639 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2640 #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	2641
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2642 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	2643 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2644 /* 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	2645 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	2646 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	2647 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2648 }
2057 9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2649 /* 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	2650 * 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	2651 */
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	2652 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	2653 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	2654 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2655 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	2656 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	2657 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2658
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2659 /* 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	2660 * 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	2661 * 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	2662 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2663 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	2664 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2665 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2667 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668 * 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	2669 * 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	2670 * 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	2671 * 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	2672 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2673 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	2674 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2675 int _locked_by_me = 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	2676
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2677 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	2678 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	2679 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	2680 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2681
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2682 /*
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2683 * 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	2684 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2685 * 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	2686 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2687 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	2688 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2689 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	2690
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2691 _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	2692
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2693 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	2694 free(oldfont);
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2695 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2696
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2697 /* 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	2698 * 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	2699 */
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2700 char _convert_font(const char font)
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2701 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2702 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	2703
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2704 if(font)
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2705 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2706 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	2707 #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	2708 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	2709 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	2710 #endif
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2711
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2712 /* 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	2713 * Format: ##.Fontname
2259 5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2714 * 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	2715 */
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2716 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	2717 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2718 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	2719 #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	2720 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	2721 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	2722
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2723 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	2724 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	2725
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2259 diff changeset	2726 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	2727 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	2728 #else
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2248 diff changeset	2729 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	2730 #endif
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2731 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2732 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2733 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	2734 }
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	2735
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2736 /* 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	2737 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	2738 {
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2739 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	2740 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	2741 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	2742
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2743 /* 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	2744 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2745 {
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	2746 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	2747 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	2748 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	2749 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2750
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2751 /* 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	2752 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	2753 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2754 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	2755 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	2756
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2757 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	2758 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	2759 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	2760 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	2761 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	2762 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2763 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	2764 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	2765 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2766
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2767 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	2768 {
2242 0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2769 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	2770 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	2771
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2772 /* 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	2773 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2774 {
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	2775 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	2776 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	2777 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	2778 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2779
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2237 diff changeset	2780 /* 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	2781 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	2782 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2783 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	2784
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2785 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	2786 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	2787 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	2788 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	2789 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2242 diff changeset	2790 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	2791 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2792
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2793 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2794 * 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	2795 * 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	2796 * 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	2797 * 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	2798 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2799 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	2800 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2801 GtkWidget *handle2 = handle;
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	2802 char *font = _convert_font(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	2803 int _locked_by_me = 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	2804 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	2805
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2806 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	2807 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	2808 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2809 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	2810 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	2811 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	2812 }
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	2813 /* 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	2814 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	2815 {
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	2816 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	2817 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	2818 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	2819 }
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2820 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	2821 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2822 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	2823 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	2824 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	2825 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2826
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2827 /* 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	2828 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	2829 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	2830 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	2831 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	2832
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2833 _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	2834
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2835 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	2836 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	2837 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2838
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	2839 /* 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	2840 * 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	2841 * 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	2842 * 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	2843 * 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	2844 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2845 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	2846 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2847 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	2848 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	2849 char *name = font ? strchr(font, '.') : 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	2850 int _locked_by_me = FALSE;
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	2851 char *retfont = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2852
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2853 /* 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	2854 * 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	2855 * 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	2856 */
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	2857 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	2858 {
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	2859 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	2860 *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	2861 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	2862 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	2863 }
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	2864
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	2865 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	2866 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	2867 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	2868 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2869 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	2870 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	2871 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2872
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	2873 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	2874
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2875 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	2876 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2877 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	2878 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	2879 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2880 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	2881 /* 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	2882 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	2883 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2884 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	2885
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2886 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	2887 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2888 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2889 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2890 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	2891 /* 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	2892 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	2893 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2894 /* 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	2895 * 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	2896 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2897 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	2898 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	2899 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2900 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2901 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	2902 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2903 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2904 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	2905 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2906 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2907 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2908
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2909 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2910 * 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	2911 * 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	2912 * 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	2913 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2914 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	2915 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2916 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	2917 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	2918 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	2919 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	2920 char *retfont=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	2921 int _locked_by_me = 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	2922
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2923 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	2924 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	2925 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2926 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	2927 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	2928 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	2929 }
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	2930 /* 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	2931 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	2932 {
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	2933 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	2934 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	2935 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	2936 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2937
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2938 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	2939 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	2940 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2941 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	2942 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	2943 {
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	2944 int len, x;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2945
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2946 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	2947 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	2948 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	2949 /* 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	2950 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	2951 {
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	2952 int size;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2953
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	2954 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	2955 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	2956 {
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	2957 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	2958 }
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	2959 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	2960 /* 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	2961 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	2962 {
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	2963 /* 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	2964 * 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	2965 */
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	2966 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	2967 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	2968 }
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	2969 }
775 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 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	2971 }
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 }
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 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	2974 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	2975 }
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
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 void _free_gdk_colors(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	2978 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2979 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	2980
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2981 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	2982 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	2983
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2984 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	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 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	2987 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	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
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 /* Free old color pointers and allocate new ones */
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2991 static void _save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back)
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2992 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2993 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	2994 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	2995
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2996 _free_gdk_colors(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	2997
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2998 *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	2999 *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	3000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3001 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	3002 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	3003 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3004
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3005 static int _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	3006 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3007 /* 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	3008 * 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	3009 */
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	3010 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	3011
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3012 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	3013 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3014 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	3015 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	3016 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	3017 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	3018 }
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 else if(fore != DW_CLR_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	3020 forecolor = _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	3021
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	3022 _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	3023
775 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 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	3025 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	3026 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	3027 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	3028 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	3029 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	3030 }
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 else if(back != DW_CLR_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	3032 backcolor = _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	3033
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	3034 _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	3035
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 _save_gdk_colors(handle, forecolor, backcolor);
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 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	3039 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3040 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3041 * 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	3042 * 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	3043 * 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	3044 * 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	3045 * 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	3046 */
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 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	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 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	3050 int _locked_by_me = 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	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 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	3053
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 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	3055 {
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 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	3057 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	3058 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	3059 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3060 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	3061 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3062 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	3063 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	3064 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3065 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	3066 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	3067 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3068 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3069
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3070 _set_color(handle2, fore, 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	3071
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 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	3073 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	3074 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3075
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3076 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3077 * 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	3078 * 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	3079 * 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	3080 * 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	3081 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3082 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	3083 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3084 /* 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	3085 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	3086 }
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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3088 #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	3089 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3090 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3091 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3092 #endif
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3093
775 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 * 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	3096 * 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	3097 * 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	3098 */
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 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	3100 {
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 int _locked_by_me = 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	3102
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 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3104 #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	3105 _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	3106 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3107 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3108 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3109 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3110 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3111 _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	3112 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	3113 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	3114 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	3115 FALSE,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3116 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	3117 NULL,
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3118 GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3119 #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	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 }
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 * 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	3125 * 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	3126 * 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	3127 * 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	3128 */
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 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	3130 {
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 int _locked_by_me = 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	3132 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	3133
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 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	3135 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	3136 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	3137 GdkPixbuf *pixbuf = _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	3138 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	3139 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3140 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	3141 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	3142 else
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	3143 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	3144 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	3145 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	3146 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	3147 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	3148 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	3149 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3152 * 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	3153 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3154 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	3155 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3156 int _locked_by_me = 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	3157
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3158 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3159 #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	3160 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3161 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3162 _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	3163 #else
2208 3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	3164 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	3165 _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	3166 #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	3167 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	3168 }
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 * 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	3172 * 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	3173 * 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	3174 * 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	3175 * 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	3176 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3177 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	3178 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3179 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	3180 int _locked_by_me = 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	3181 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	3182
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3183 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	3184 #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	3185 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	3186 {
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 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	3188
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 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	3190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3191 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	3192 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	3193 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	3194 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	3195 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	3196
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 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	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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3200 #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	3201 {
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3202 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	3203 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	3204
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	3205 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	3206
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3207 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	3208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3209 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	3210 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	3211
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3212 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	3213
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3214 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	3215 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	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 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	3218 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	3219
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 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	3221 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	3222
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	3223 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	3224 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	3225
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3226 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	3227 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	3228 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3229 {
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3230 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	3231 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	3232
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3233 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	3234 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	3235 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3236
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	3237 /* 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	3238 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	3239
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 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	3241 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	3242 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	3243
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 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	3245 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	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 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	3248 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	3249
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	3250 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	3251 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	3252 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	3253 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	3254 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	3255 }
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 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	3257 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	3258 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	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
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 * 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	3263 * 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	3264 * 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	3265 * 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	3266 */
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 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	3268 {
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 GtkWidget tmp, 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	3270 int _locked_by_me = 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	3271
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 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	3273 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	3274 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	3275
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3276 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	3277 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	3278 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	3279 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	3280 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	3281 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	3282 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	3283 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3284
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3285 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3286 * 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	3287 * 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	3288 * 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	3289 * 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	3290 */
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 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	3292 {
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 GtkWidget tmp, box, *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	3294 int _locked_by_me = 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	3295
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 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	3297 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	3298 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	3299
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3300 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	3301 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	3302
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 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	3304 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	3305 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	3306 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	3307 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	3308
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3309 #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	3310 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	3311 #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	3312 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	3313 #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	3314 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	3315 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	3316 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	3317
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3318 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	3319 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	3320 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3321
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 /*
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 * 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	3324 * 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	3325 * 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	3326 * 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	3327 */
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 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	3329 {
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 int val = -1, _locked_by_me = 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	3331 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	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 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	3334 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	3335
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 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	3337 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	3338 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	3339 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	3340 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	3341 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	3342 val = _round_value(gtk_adjustment_get_value(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	3343 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	3344 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	3345 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3348 * 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	3349 * 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	3350 * 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	3351 * 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	3352 */
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 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	3354 {
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 int range = -1, _locked_by_me = 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	3356 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	3357
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3358 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	3359 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	3360
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3361 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	3362 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	3363 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	3364 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	3365 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	3366 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	3367 {
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 range = _round_value(gtk_adjustment_get_upper(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	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 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	3371 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	3372 }
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
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 /*
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 * 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	3376 * 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	3377 * 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	3378 * 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	3379 * 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	3380 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3381 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	3382 {
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	3383 GtkWidget tmp, frame;
775 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 int _locked_by_me = 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	3385
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 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	3387 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	3388 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	3389 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	3390
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3391 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	3392 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	3393 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	3394 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	3395 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	3396 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	3397 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	3398 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	3399 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	3400 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	3401 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	3402 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	3403 }
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
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3405 #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	3406 /*
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 * 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	3408 * 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	3409 * 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	3410 */
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 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	3412 {
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 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	3414 int _locked_by_me = 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	3415
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3416 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	3417 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	3418 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	3419 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	3420 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	3421 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3422 #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	3423
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 /*
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 * 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	3426 * 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	3427 * 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	3428 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3429 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	3430 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3431 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	3432 int _locked_by_me = 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	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 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	3436 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	3437 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	3438 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	3439 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	3440 }
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
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 /*
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 * 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	3444 * 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	3445 * 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	3446 * 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	3447 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3448 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	3449 {
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 GtkWidget tmp, pagearray = calloc(sizeof(GtkWidget ), 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	3451 int _locked_by_me = 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	3452
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3453 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	3454 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	3455 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	3456 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	3457 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	3458 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	3459 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	3460 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	3461 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	3462 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	3463 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	3464 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	3465 }
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
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 /*
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 * 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	3469 * 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	3470 * 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	3471 * 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	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 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	3474 {
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 int _locked_by_me = 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	3476 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	3477 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	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 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	3480 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	3481 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	3482 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	3483 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	3484 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	3485 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	3486 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	3487 }
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 * 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	3491 * 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	3492 * 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	3493 * 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	3494 * 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	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 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	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 int _locked_by_me = 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	3499 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	3500 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3501 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	3502
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3503 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	3504 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	3505 (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	3506 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3507 /* 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	3508 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	3509 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3510 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	3511 /* 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	3512 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	3513 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	3514 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	3515 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	3516 /* 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	3517 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	3518 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	3519 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	3520 }
775 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 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	3522 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	3523 }
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
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 /*
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 * 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	3527 * 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	3528 * 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	3529 */
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 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	3531 {
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 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	3533 {
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 int _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	3535 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	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 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	3538 /* 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	3539 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	3540 (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	3541 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	3542 /* 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	3543 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	3544 *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	3545 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	3546 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3548
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3549 char _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	3550 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3551 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	3552 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	3553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3554 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	3555 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3556 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	3557 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3558 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	3559 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	3560 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3561 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	3562 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3563 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	3564 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	3565 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	3566 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3568 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	3569 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	3570 }
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 * 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	3574 * 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	3575 * 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	3576 * 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	3577 * 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	3578 * 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	3579 * 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	3580 * 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	3581 * 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	3582 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3583 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	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 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	3586 char accel, *tempbuf = malloc(strlen(title)+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	3587 int _locked_by_me = FALSE, 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	3588 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	3589
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3590 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	3591 {
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 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	3593 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	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 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	3597 accel = _removetilde(tempbuf, 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	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 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	3600 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	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 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	3603 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	3604 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	3605 {
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	3606 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	3607
775 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 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	3609 {
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 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	3611 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	3612 {
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 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	3614 #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	3615 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	3616 #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	3617 }
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	3618 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	3619 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	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 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	3622 {
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 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	3624 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	3625 {
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 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	3627 #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	3628 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	3629 #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	3630 }
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	3631 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	3632 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	3633 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3635
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 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	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 (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	3639 {
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	3640 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	3641
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	3642 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	3643 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	3644 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	3645 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	3646 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	3647 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3648
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 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	3650 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	3651 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	3652 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	3653
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3654 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	3655 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	3656 /*
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 * 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	3658 */
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 ( 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	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 _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	3662 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	3663 _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	3664 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3666 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	3667 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	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 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	3670 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	3671 }
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
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3673 GtkWidget _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	3674 {
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 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	3676 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	3677
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 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	3679 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	3680
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 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	3682 {
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	3683 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	3684 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	3685
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	3686 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	3687
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3688 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	3689 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3690 if((menuitem = _find_submenu_id(submenu, 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	3691 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	3692 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694 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	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 /*
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 * 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	3699 * 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	3700 * 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	3701 * 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	3702 * 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	3703 * 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	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 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	3706 {
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	3707 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	3708 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	3709 int _locked_by_me = 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	3710
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 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	3712 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	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 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	3715 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	3716 tmphandle = _find_submenu_id(menu, numbuf);
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
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 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	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 _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	3721 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	3722 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	3723 _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	3724 }
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 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	3726 }
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
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 * 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	3730 * 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	3731 * 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	3732 * 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	3733 * 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	3734 */
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 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	3736 {
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	3737 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	3738 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	3739 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	3740 int _locked_by_me = 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	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 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	3743 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	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 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	3746 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	3747 tmphandle = _find_submenu_id(menu, numbuf);
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
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 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	3750 {
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 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	3752 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	3753 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	3754 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	3755
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 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	3757 {
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 _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	3759 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	3760 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	3761 _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	3762 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3763 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3764 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	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 ( 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	3770 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	3771 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	3772 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	3773 _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	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 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	3777 }
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
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 /*
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3780 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3781 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3782 * 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	3783 * 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	3784 * Returns:
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3785 * 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	3786 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3787 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	3788 {
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	3789 char numbuf[25] = {0};
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3790 GtkWidget *tmphandle;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3791 int _locked_by_me = FALSE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3792 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3793
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3794 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3795 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3796
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3797 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	3798 snprintf(numbuf, 24, "%lu", id);
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3799 tmphandle = _find_submenu_id(menu, numbuf);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3800
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3801 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3802 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3803 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3804 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	3805 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3806 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3807 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3808 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3809 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3810
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3811 /*
775 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 * 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	3813 * 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	3814 * 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	3815 * 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	3816 * 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	3817 * 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	3818 */
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 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	3820 {
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 int _locked_by_me = 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	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 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	3824 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	3825
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3826 _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	3827
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3828 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3829 #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	3830 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	3831 #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	3832 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	3833 #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	3834 *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	3835 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	3836 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3837
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3840 * 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	3841 * 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	3842 * 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	3843 * 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	3844 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 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	3846 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3847 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	3848 #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	3849 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	3850 int _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	3851 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	3852
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3853 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	3854 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	3855
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3856 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	3857 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3858 #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	3859 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	3860 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	3861 #else
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3862 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	3863 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	3864 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3865 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	3866 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	3867 }
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	3868 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	3869 #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	3870 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	3871 *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	3872 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	3873 *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	3874 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3877 * 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	3878 * 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	3879 * 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	3880 * 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	3881 */
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 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	3883 {
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3884 #ifdef GDK_WINDOWING_X11
775 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 int _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	3886 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	3887
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3888 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	3889 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	3890
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3891 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	3892 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3893 #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	3894 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	3895 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	3896 #else
2342 5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3897 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	3898 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	3899 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3900 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	3901 }
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2333 diff changeset	3902 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	3903 #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	3904 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3905
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3906 #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	3907 #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	3908 #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	3909
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 GtkWidget *_tree_create(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	3911 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3912 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	3913
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3914 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	3915 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	3916 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	3917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3918 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	3919 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	3920 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	3921 }
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 GtkWidget _tree_setup(GtkWidget tmp, 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	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 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	3926 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	3927 #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	3928 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	3929 #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	3930 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	3931 #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	3932 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	3933 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	3934 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3935
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3936 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 * 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	3938 * 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	3939 * 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	3940 * 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	3941 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3942 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	3943 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3944 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	3945 int _locked_by_me = 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	3946
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3947 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	3948 if(!(tmp = _tree_create(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	3949 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3950 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	3951 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	3952 }
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	3953 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	3954 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	3955 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	3956 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	3957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3958
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 * 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	3961 * 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	3962 * 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	3963 * 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	3964 */
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 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	3966 {
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 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	3968 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	3969 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	3970 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	3971 GtkTreeSelection *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	3972 int _locked_by_me = 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	3973
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3974 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	3975 if(!(tmp = _tree_create(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	3976 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3977 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	3978 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	3979 }
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 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_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	3981 tree = _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	3982 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	3983 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	3984 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	3985
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 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	3987 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	3988 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	3989 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	3990 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	3991 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	3992
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3993 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	3994 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	3995 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	3996
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 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	3998 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	3999 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	4000
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4001 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	4002 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	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 /*
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 * 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	4010 * 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	4011 * 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	4012 * 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	4013 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4014 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	4015 {
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 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	4017 int _locked_by_me = 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	4018
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 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	4020 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	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 /* 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	4023 #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	4024 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	4025 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	4026 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4027 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	4028 #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	4029 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	4030 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	4031 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	4032 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	4033 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	4034 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	4035 }
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
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 /*
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 * 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	4039 * 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	4040 * 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	4041 * 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	4042 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4043 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	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 GtkWidget tmp, 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	4046 int _locked_by_me = 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	4047
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 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	4049 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	4050 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	4051 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	4052 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	4053 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	4054 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	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 /* 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	4057 #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	4058 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	4059 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	4060 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4061 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	4062 #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	4063 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	4064 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	4065 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	4066 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	4067 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	4068 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4071 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4072 * 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	4073 * 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	4074 * 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	4075 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4076 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	4077 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	4078 GtkWidget tmp, tmpbox;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4079 int _locked_by_me = 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	4080
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_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	4082 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	4083 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	4084 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	4085 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	4086 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	4087 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	4088 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	4089
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 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	4091 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	4092 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	4093 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	4094 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	4095 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	4096 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	4097 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	4098 }
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
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 /*
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 * 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	4102 * 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	4103 * 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	4104 * 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	4105 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4106 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	4107 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4108 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	4109 int _locked_by_me = 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	4110
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 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	4112 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	4113
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4114 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	4115 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	4116
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 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	4118 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	4119
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4120 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	4121 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	4122 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	4123 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	4124 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4126 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4127 * 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	4128 * 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	4129 * 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	4130 * 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	4131 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4132 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	4133 {
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 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	4135 int _locked_by_me = 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	4136
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 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	4138 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	4139
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_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	4141 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	4142 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	4143
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 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	4145 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	4146
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4147 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	4148 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	4149 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	4150 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	4151 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154 * 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	4155 * 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	4156 * 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	4157 * 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	4158 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4159 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	4160 {
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 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	4162 GtkListStore *store;
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	4163 int _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	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 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	4166 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	4167 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	4168 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	4169 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	4170 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	4171 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	4172 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	4173 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	4174 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	4175 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	4176 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	4177 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	4178 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4180 /*
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 * 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	4182 * 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	4183 * 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	4184 * 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	4185 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4186 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	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 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	4189 int _locked_by_me = 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	4190
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 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	4192 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	4193 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	4194 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	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 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	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: 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	4205 * 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	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_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	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 GtkWidget *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	4211 int _locked_by_me = 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	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 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	4215 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	4216
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4217 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	4218 {
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 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	4220 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	4221 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	4222 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 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	4224 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	4225 {
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 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	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 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	4229 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	4230 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	4231 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4234 * 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	4235 * 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	4236 * 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	4237 * 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	4238 * 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	4239 * 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	4240 * 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	4241 * (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	4242 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4243 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	4244 {
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	4245 GtkWidget *tmp;
1831 ce7543633fef Slight typo in that last commit fixed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1830 diff changeset	4246 GtkWidget *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	4247 int _locked_by_me = 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	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 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	4250 /* 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	4251 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	4252 /* 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	4253 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	4254 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	4255 {
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 dw_window_set_bitmap( bitmap, 0, filename );
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	4257 gtk_container_add (GTK_CONTAINER(tmp), 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	4258 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	4259 }
1832 cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1831 diff changeset	4260 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	4261 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	4262 {
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	4263 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	4264 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4265 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	4266 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	4267 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	4268 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4269
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 * 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	4272 * 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	4273 * 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	4274 * 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	4275 * 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	4276 * (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	4277 * 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	4278 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4279 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	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 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	4282 GtkWidget *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	4283 int _locked_by_me = 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	4284
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 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	4286 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	4287 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	4288
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4289 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	4290 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 dw_window_set_bitmap_from_data(bitmap, 0, data, 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	4292 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	4293 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	4294 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295 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	4296 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	4297 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4298 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	4299 }
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 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	4301 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	4302 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	4303 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4304
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4305 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4306 * 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	4307 * 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	4308 * 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	4309 * 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	4310 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4311 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	4312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4313 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	4314 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	4315 int _locked_by_me = 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	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 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	4318 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	4319 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	4320 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	4321 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	4322 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	4323 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	4324 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	4325 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	4326 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	4327 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	4328 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	4329 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	4330 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331
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 * 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	4334 * 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	4335 * 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	4336 * 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	4337 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4338 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	4339 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4340 /* 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	4341 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	4342 int _locked_by_me = 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	4343
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 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	4345 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	4346 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	4347 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	4348
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4349 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	4350 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	4351 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	4352 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	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
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 /*
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 * 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	4357 * 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	4358 * 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	4359 * 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	4360 * 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	4361 */
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 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	4363 {
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 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	4365 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	4366 int _locked_by_me = 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	4367
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 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	4369 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	4370 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	4371 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	4372 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	4373 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	4374 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	4375 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	4376 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	4377 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	4378 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	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
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4381 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4382 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	4383 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	4384 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4385
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4386 /*
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 * 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	4388 * 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	4389 * 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	4390 * 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	4391 * 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	4392 */
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 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	4394 {
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 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	4396 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	4397 int _locked_by_me = FALSE;
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4398 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4399 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4400 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4401
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4402 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4403 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4404 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4405 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4406 #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	4407 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	4408 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	4409 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4410 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4411 #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	4412 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	4413 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	4414 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	4415 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	4416 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	4417 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	4418 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	4419 }
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
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 /*
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 * 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	4423 * 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	4424 * 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	4425 */
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 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	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 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	4429 int _locked_by_me = 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	4430
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4431 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	4432 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	4433 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	4434 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	4435 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	4436 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	4437 }
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
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 /*
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 * 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	4441 * 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	4442 * 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	4443 * 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	4444 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4445 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	4446 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4447 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	4448 int _locked_by_me = 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	4449
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4450 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	4451 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	4452 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	4453 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	4454 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	4455 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	4456 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	4457 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	4458 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459
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 /*
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 * 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	4462 * 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	4463 * 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	4464 * 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	4465 */
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 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	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 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	4469 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	4470 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	4471 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	4472 GtkTreeSelection *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	4473 int _locked_by_me = 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	4474
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 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	4476 if(!(tmp = _tree_create(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	4477 {
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 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	4479 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	4480 }
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 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	4482 tree = _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	4483 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	4484 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	4485
775 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 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	4487 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	4488 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	4489 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	4490
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 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	4492 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	4493 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	4494
775 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 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	4496 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	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 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	4499 }
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 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	4501 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4502 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	4503 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4504 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	4505 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	4506 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	4507 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	4508 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	4509 }
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
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 /*
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 * 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	4513 * 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	4514 * 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	4515 * 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	4516 */
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 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	4518 {
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 GdkPixbuf *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	4520 int _locked_by_me = 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	4521
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 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	4523 icon_pixbuf = _find_pixbuf(icon, 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	4524
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 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	4526 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4527 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	4528 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	4529 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	4530 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4531 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	4532 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533
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 /*
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 * 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	4536 * 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	4537 * 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	4538 * 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	4539 * (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	4540 * 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	4541 * 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	4542 * 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	4543 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4544 void 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	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 GdkPixbuf *tmp = 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	4547 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	4548 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	4549 int _locked_by_me = 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	4550
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 if(!id && !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	4552 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	4553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4554 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	4555 if(id)
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	4556 tmp = _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	4557 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	4558 {
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	4559 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	4560
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 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	4562 {
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 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	4564 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	4565 }
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 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	4568
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 /* 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	4570 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	4571 {
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 /* 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	4573 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	4574 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4575 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	4576 strcat( file, image_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	4577 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	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 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	4580 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	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 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	4584 {
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 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	4586 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	4587 }
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 }
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 tmp = gdk_pixbuf_new_from_file(file, 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	4590 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4591
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4592 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	4593 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 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	4595 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4596 GtkWidget pixmap = (GtkWidget )g_object_get_data( G_OBJECT(handle), "_dw_bitmap" );
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4597 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4598 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4599 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4600 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4601 }
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 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	4603 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604 gtk_image_set_from_pixbuf(GTK_IMAGE(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	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 }
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 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	4608 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4611 * 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	4612 * 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	4613 * 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	4614 * 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	4615 * (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	4616 * 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	4617 * 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	4618 * 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	4619 * 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	4620 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4621 void 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	4622 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4623 GdkPixbuf *tmp = 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	4624 int _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	4625
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4626 if(!id && !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	4627 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	4628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4629 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	4630 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	4631 {
775 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 /*
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 * 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	4634 * 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	4635 */
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4636 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	4637 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	4638
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4639 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	4640 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4641 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	4642 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	4643 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4644 /* 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	4645 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	4646 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647 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	4648 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	4649 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4650
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4651 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	4652 /* 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	4653 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	4654 }
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4655 else if (id)
fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4656 tmp = _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	4657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4658 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	4659 {
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4660 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	4661 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4662 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	4663
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4664 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4665 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4666 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4667 else
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4668 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), 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	4669 }
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 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	4671 }
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
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 /*
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 * 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	4675 * 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	4676 * 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	4677 * 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	4678 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4679 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	4680 {
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 int _locked_by_me = 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	4682 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	4683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 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	4685 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	4686 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	4687 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	4688 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	4689 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	4690 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	4691 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	4692 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	4693 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	4694 {
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 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	4696 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 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	4698 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	4699 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	4700 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4702 * 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	4703 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4704 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	4705 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	4706 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	4707 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	4708 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	4709 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4710 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	4711 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4713 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4714 * 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	4715 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4716 * 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	4717 * 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	4718 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4719 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	4720 {
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4721 int _locked_by_me = FALSE;
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4722
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4723 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	4724 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	4725 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	4726 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	4727 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	4728 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	4729 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4730
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4731 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4732 * 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	4733 * 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	4734 * 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	4735 * 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	4736 * 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	4737 */
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 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	4739 {
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4740 const char *possible = 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	4741 int _locked_by_me = 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	4742
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 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	4744 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	4745 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	4746 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	4747 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	4748 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	4749 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	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_UNLOCK;
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4752 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	4753 }
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
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 /*
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 * 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	4757 * 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	4758 * 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	4759 */
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 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	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 int _locked_by_me = 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	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 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	4765 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	4766 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	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 /*
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 * 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	4771 * 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	4772 * 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	4773 */
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 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	4775 {
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 int _locked_by_me = 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	4777
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 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	4779 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	4780 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	4781 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4782
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4783 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4784 * 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	4785 * 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	4786 * 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	4787 * 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	4788 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4789 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	4790 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4791 GList orig = NULL, list = 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	4792 int _locked_by_me = 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	4793
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4794 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	4795 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	4796 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4797 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	4798 }
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 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	4800 {
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 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	4802 {
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	4803 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	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 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	4806 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	4807 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	4808 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	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 }
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 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	4812 }
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 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	4814 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	4815 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	4816 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4819 /*
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 * 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	4821 * 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	4822 * 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	4823 * 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	4824 * 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	4825 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4826 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	4827 {
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 unsigned int tmppoint = 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	4829 int _locked_by_me = 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	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 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	4833 {
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 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	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 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	4837 {
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 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	4839 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	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 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	4842 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	4843 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	4844 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	4845 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	4846 }
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 }
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 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	4849 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	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
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 /*
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 * 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	4854 * 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	4855 * 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	4856 * 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	4857 * 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	4858 * 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	4859 */
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 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	4861 {
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 int _locked_by_me = 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	4863 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	4864
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 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	4866 /* 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	4867 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	4868 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	4869 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	4870 {
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 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	4872
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 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	4874 {
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 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	4876 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	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 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	4879 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	4880 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	4881 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	4882 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	4883 {
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 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	4885 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	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 }
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 }
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 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	4890 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893 * 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	4894 * 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	4895 * 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	4896 * 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	4897 * 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	4898 */
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 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	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 int _locked_by_me = 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	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(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	4904 *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	4905 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	4906 *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	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 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	4909 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	4910 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4911 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	4912
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 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	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 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	4916
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 if(bytes)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4918 *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	4919 if(lines)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4920 *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	4921 }
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 }
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 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	4924 }
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
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 * 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	4928 * 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	4929 * 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	4930 * 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	4931 * 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	4932 */
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 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	4934 {
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 int _locked_by_me = 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	4936
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 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	4938 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	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 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	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 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	4943 {
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 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	4945 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	4946
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 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	4948 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	4949 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	4950 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	4951 }
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 }
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 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	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 /*
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 * 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	4958 * 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	4959 * 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	4960 */
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 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	4962 {
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 int length, _locked_by_me = 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	4964
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 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	4966 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	4967 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4968 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	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(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	4971 {
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 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	4973
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 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	4975 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	4976 }
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 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	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
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 * 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	4983 * 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	4984 * 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	4985 * 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	4986 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 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	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 int _locked_by_me = 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	4990
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 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	4992 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	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 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	4995
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 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	4997 {
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 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	4999 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	5000 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	5001
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5002 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	5003 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	5004 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	5005 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	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 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	5008 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	5009 }
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 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	5011 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	5012 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	5013 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	5014 }
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 }
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 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	5017 }
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 * 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	5021 * 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	5022 * 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	5023 * 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	5024 */
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 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	5026 {
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 int _locked_by_me = 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	5028
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 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	5030 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	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 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	5033
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 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	5035 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	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 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	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
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 * 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	5042 * 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	5043 * 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	5044 * 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	5045 */
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 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	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 int _locked_by_me = 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	5049
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 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	5051 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	5052 {
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 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	5054
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 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	5056 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	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_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	5059 }
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 /*
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5062 * 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	5063 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5064 * 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	5065 * 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	5066 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5067 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	5068 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5069 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5070
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5071 /*
775 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 * 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	5073 * 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	5074 * 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	5075 * 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	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 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	5078 {
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 int _locked_by_me = 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	5080
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 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	5082 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	5083 {
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 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	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 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	5087 {
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 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	5089 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	5090 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	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 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	5093 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	5094 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	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 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	5097 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	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 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	5100 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	5101 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	5102 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	5103 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	5104 }
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 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	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
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 /*
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 * 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	5111 * 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	5112 * 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	5113 * 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	5114 * 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	5115 * 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	5116 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5117 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	5118 {
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 int _locked_by_me = FALSE, 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	5120
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 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	5122 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	5123 {
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 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	5125
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 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	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 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	5129 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	5130
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5131 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	5132 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	5133 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	5134 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	5135 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5136 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5137 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	5138 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	5139 }
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
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 /*
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 * 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	5143 * 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	5144 * 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	5145 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146 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	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 }
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
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 * 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	5152 * 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	5153 * 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	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 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	5156 {
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 }
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
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	5159 /* 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	5160 * 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	5161 */
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	5162 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	5163 {
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	5164 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	5165 {
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	5166 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	5167 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	5168 }
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	5169 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	5170 }
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	5171
775 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 * 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	5174 * 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	5175 * 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	5176 * 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	5177 */
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 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	5179 {
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 int _locked_by_me = 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	5181
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 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	5183 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	5184 {
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	5185 /* 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	5186 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	5187 {
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	5188 /* 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	5189 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	5190 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	5191 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	5192 }
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	5193 }
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	5194 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	5195 {
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	5196 /* 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	5197 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	5198 /* 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	5199 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	5200 }
775 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 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	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 /*
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 * 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	5206 * 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	5207 * 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	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 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	5210 {
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 int val = 0, _locked_by_me = 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	5212 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	5213
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 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	5215 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	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 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	5218 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	5219 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	5220 {
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 int max = _round_value(gtk_adjustment_get_upper(adjustment)) - 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	5222 int thisval = _round_value(gtk_adjustment_get_value(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	5223
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5224 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	5225 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	5226 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	5227 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	5228 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5229 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	5230 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	5231 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234 * 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	5235 * 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	5236 * 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	5237 * 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	5238 */
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 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	5240 {
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 int _locked_by_me = 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	5242 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	5243
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 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	5245 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	5246
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5247 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	5248 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	5249 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	5250 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5251 int max = _round_value(gtk_adjustment_get_upper(adjustment)) - 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	5252
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5253 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	5254 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	5255 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	5256 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	5257 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5258 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	5259 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5261 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262 * 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	5263 * 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	5264 * 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	5265 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5266 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	5267 {
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 int val = 0, _locked_by_me = 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	5269 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	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 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	5272 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	5273
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 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	5275 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	5276 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	5277 val = _round_value(gtk_adjustment_get_value(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	5278 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	5279 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	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
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 /*
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 * 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	5284 * 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	5285 * 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	5286 * 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	5287 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5288 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	5289 {
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 int _locked_by_me = 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	5291 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	5292
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 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	5294 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	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_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	5297 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	5298 if(adjustment)
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5299 {
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5300 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_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	5301 gtk_adjustment_set_value(adjustment, (gfloat)position);
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5302 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_value_changed_event", GINT_TO_POINTER(0));
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5303 }
775 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 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5308 * 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	5309 * 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	5310 * 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	5311 * 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	5312 * 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	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 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	5315 {
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 int _locked_by_me = 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	5317 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	5318
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 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	5320 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	5321
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 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	5323 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	5324 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	5325 {
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 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	5327 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	5328 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	5329 }
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 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	5331 }
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 /*
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 * 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	5335 * 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	5336 * 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	5337 * 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	5338 */
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 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	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 int _locked_by_me = 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	5342
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 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	5344 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	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 }
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 * 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	5350 * 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	5351 * 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	5352 * 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	5353 * 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	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_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	5356 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5357 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	5358 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	5359 int _locked_by_me = 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	5360
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 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	5362 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	5363 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	5364 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	5365 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5366 * 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	5367 */
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 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	5369 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	5370 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	5371 }
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 * 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	5375 * 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	5376 * 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	5377 * 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	5378 */
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 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	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 int _locked_by_me = 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	5382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5383 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	5384 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	5385 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	5386 }
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
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 * 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	5390 * 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	5391 * 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	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 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	5394 {
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 long 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	5396 int _locked_by_me = 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	5397
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 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	5399 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	5400 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	5401
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 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	5403 }
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
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 * 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	5407 * 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	5408 * 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	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 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	5411 {
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 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	5413 int _locked_by_me = 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	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 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	5416 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	5417 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	5418
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 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	5420 }
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 /*
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 * 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	5424 * 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	5425 * 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	5426 * 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	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 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	5429 {
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 int _locked_by_me = 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	5431
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 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	5433 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	5434 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	5435 }
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
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 /*
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 * 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	5439 * 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	5440 * 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	5441 * 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	5442 * 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	5443 * 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	5444 * 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	5445 * 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	5446 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5447 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	5448 {
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 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	5450 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	5451 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	5452 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	5453 HTREEITEM 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	5454 int _locked_by_me = 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	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 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	5457 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	5458
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 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	5460 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	5461 && 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	5462 (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	5463 {
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 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	5465
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 pixbuf = _find_pixbuf(icon, 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	5467
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 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	5469 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	5470 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	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 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	5473
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 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	5475 }
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 /*
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 * 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	5479 * 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	5480 * 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	5481 * 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	5482 * 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	5483 * 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	5484 * 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	5485 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5486 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	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 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	5489 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	5490 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	5491 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	5492 HTREEITEM 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	5493 int _locked_by_me = 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	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 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	5496 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	5497
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 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	5499 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	5500 && 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	5501 (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	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 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	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 pixbuf = _find_pixbuf(icon, 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	5506
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 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	5508 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	5509 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	5510 }
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 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	5512
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 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	5514 }
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 /*
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 * 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	5518 * 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	5519 * 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	5520 * 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	5521 * 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	5522 * 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	5523 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5524 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	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 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	5527 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	5528 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	5529 int _locked_by_me = 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	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 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	5532 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	5533
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 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	5535 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	5536 && 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	5537 (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	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 pixbuf = _find_pixbuf(icon, 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	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 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	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 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	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
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 /*
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 * 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	5548 * 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	5549 * 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	5550 * 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	5551 * 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	5552 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5553 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	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 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	5557 int _locked_by_me = 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	5558
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 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	5560 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	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 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	5563 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	5564 && 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	5565 (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	5566 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	5567 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	5568 }
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 /*
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 * 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	5572 * 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	5573 * 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	5574 * 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	5575 */
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 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	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 int _locked_by_me = 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	5579 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	5580 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	5581 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	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 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	5584 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	5585
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 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	5587 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	5588
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 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	5590 (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	5591 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	5592 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5593 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5594 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5595 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5596 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5597 }
775 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 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	5599 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	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
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 /*
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 * 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	5604 * 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	5605 * 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	5606 * 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	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 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	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 int _locked_by_me = 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	5611 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	5612 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	5613 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	5614
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 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	5616 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	5617
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 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	5619 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	5620
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 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	5622 (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	5623 {
1900 969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5624 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5625
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5626 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	5627 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	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_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	5630 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	5631 }
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
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 /*
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 * 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	5635 * 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	5636 * 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	5637 * 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	5638 */
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 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	5640 {
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 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	5642 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	5643 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	5644 int _locked_by_me = 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	5645
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 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	5647 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	5648
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 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	5650 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	5651 && 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	5652 (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	5653 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	5654 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	5655 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	5656 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5659 * 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	5660 * 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	5661 * 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	5662 * 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	5663 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5664 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	5665 {
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 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	5667 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	5668 int _locked_by_me = 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	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 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	5671 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	5672
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 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	5674 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	5675 && 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	5676 (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	5677 {
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 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	5679 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	5680
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 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	5682 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	5683 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	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_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	5686 }
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 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	5689 {
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 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	5691 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	5692
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5693 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	5694 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	5695 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	5696 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	5697
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 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	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 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	5701 _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	5702 } 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	5703 }
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 }
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 /*
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 * 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	5708 * 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	5709 * 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	5710 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5711 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	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 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	5714 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	5715 int _locked_by_me = 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	5716
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(!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	5718 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	5719
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 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	5721 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	5722 && 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	5723 (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	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 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	5726
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 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	5728 {
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 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	5730 _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	5731 } 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	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 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	5734 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5735 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	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
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 /*
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 * 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	5740 * 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	5741 * 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	5742 * 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	5743 */
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 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	5745 {
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 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	5747 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	5748 int _locked_by_me = 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
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 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	5751 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	5752
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 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	5754 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	5755 && 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	5756 (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	5757 {
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 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	5759 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	5760 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	5761 }
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 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	5763 }
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 /*
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 * 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	5767 * 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	5768 * 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	5769 * 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	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 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	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 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	5774 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	5775 int _locked_by_me = 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	5776
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 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	5778 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	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 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	5781 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	5782 && 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	5783 (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	5784 {
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 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	5786 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	5787 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	5788 }
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 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	5790 }
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 /*
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 * 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	5794 * 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	5795 * 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	5796 * 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	5797 */
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 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	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 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	5801 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	5802 int _locked_by_me = 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	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 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	5805 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	5806
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 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	5808 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	5809 && 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	5810 (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	5811 {
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 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	5813 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	5814 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5815 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	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
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5818 #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	5819
775 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 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	5821 {
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 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	5823 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	5824 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	5825 GtkListStore *store;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5826 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	5827 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	5828 GtkTreeSelection *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	5829 int _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	5830 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	5831
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5832 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	5833 /* 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	5834 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	5835 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	5836
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5837 /* 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	5838 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	5839 /* 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	5840 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	5841 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	5842 /* 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	5843 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	5844 {
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	5845 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	5846 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5847 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	5848 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	5849 }
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	5850 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	5851 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5852 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	5853 }
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 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	5855 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5856 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	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 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	5859 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5860 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	5861 }
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 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	5863 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5864 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	5865 }
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 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	5867 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5868 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	5869 }
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 /* 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	5872 store = gtk_list_store_newv(count + _DW_CONTAINER_STORE_EXTRA + 1, 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	5873 tree = _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	5874 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	5875 /* 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	5876 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	5877 {
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	5878 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	5879 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	5880 col = gtk_tree_view_column_new();
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5881 rend = NULL;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5882 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	5883
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	5884 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	5885 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5886 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	5887 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	5888 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	5889 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	5890 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	5891 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	5892 }
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	5893 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	5894 {
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	5895 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	5896 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	5897 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	5898 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 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	5900 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5901 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	5902 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	5903 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	5904 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	5905 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5906 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	5907 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5908 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	5909 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	5910 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	5911 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	5912 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5913 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	5914 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5915 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	5916 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	5917 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	5918 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	5919 }
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 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	5921 {
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 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	5923 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	5924 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	5925 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	5926 }
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	5927 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	5928 params[2] = tree;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5929 g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_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	5930 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	5931 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5932 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5933 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	5934 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5935 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	5936 }
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5937 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5938 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5939 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	5940 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5941 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	5942 }
775 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 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	5944 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 /* 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	5946 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	5947 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	5948 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	5949 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	5950 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	5951 {
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 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	5953 }
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 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	5955 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5956 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	5957 }
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	5958 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	5959 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	5960 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	5961 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	5962 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	5963 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	5964 }
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 /*
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 * 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	5968 * 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	5969 * 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	5970 * 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	5971 * 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	5972 * 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	5973 * 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	5974 * (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	5975 */
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 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	5977 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5978 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	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
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 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5982 * 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	5983 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5984 * 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	5985 * 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	5986 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5987 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	5988 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5989 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	5990
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5991 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	5992 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5993
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5994 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5995 * 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	5996 * 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	5997 * 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	5998 * 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	5999 * 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	6000 * 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	6001 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6002 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	6003 {
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	6004 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	6005 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	6006 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	6007
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6008 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	6009 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	6010
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	6011 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	6012 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	6013
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	6014 _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	6015
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6016 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6017 {
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	6018 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	6019 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	6020 }
775 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 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	6022 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	6023 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	6024 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6025
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6027 * 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	6028 * 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	6029 * 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	6030 * 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	6031 * 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	6032 * 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	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 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	6035 {
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6036 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	6037 }
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
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	6039 /* 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	6040 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	6041 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6042 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6043 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6044 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	6045 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	6046
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6047 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	6048 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	6049 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	6050 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	6051 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	6052 }
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	6053 }
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	6054 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	6055 }
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	6056
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6057 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6058 * 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	6059 * 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	6060 * 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	6061 * 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	6062 * (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	6063 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6064 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	6065 {
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 int _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	6067 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	6068 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	6069 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	6070
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6071 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	6072 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	6073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6074 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	6075
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6076 /* 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	6077 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	6078 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6079 /* 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	6080 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	6081 {
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 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	6083 strcat( file, image_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	6084 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	6085 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6086 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	6087 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	6088 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6090 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	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 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	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 }
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
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 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	6097 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	6098 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	6099 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6103 * 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	6104 * 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	6105 * 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	6106 * 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	6107 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6108 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	6109 {
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6110 int fd, written = -1, _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	6111 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	6112 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	6113
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6114 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6115 * 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	6116 * 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	6117 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6118 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	6119 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6120 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	6121 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	6122 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6123 /* 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	6124 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	6125 return 0;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6126 DW_MUTEX_LOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6127 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	6128 DW_MUTEX_UNLOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6129 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	6130 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	6131 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6133 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6134 * 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	6135 * 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	6136 * 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	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 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	6139 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	6140 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	6141
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6142 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	6143 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6144 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	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 }
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
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 * 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	6150 * 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	6151 * 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	6152 * 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	6153 */
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 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	6155 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6156 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	6157 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	6158 GtkListStore *store = NULL;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6159 int _locked_by_me = FALSE;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6160
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6161 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	6162 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	6163
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6164 /* 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	6165 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	6166 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	6167
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6168 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	6169 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6170 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6171
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	6172 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	6173
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6174 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	6175 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6176 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	6177 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6178 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	6179 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	6180 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6181 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	6182 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	6183 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6185 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6186 * 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	6187 * 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	6188 */
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6189 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	6190 {
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	6191 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	6192 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	6193 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	6194 GtkListStore *store = NULL;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6195 int _locked_by_me = FALSE;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6196
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6197 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	6198 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	6199
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6200 /* 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	6201 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	6202 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	6203
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6204 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	6205 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6206 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6207
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	6208 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	6209 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	6210 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	6211 {
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	6212 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	6213 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6214
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6215 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	6216 {
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	6217 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	6218 {
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	6219 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	6220 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	6221 char tmp = data ? (char )thisdata[1] : NULL;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6222 GdkPixbuf *pixbuf = hicon ? _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	6223
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6224 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	6225 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	6226 }
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	6227 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	6228 {
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	6229 HICN hicon = data ? ((HICN )data) : 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	6230 GdkPixbuf *pixbuf = hicon ? _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	6231
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6232 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	6233 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6234 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	6235 {
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	6236 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	6237 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	6238 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6239 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	6240 {
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	6241 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	6242
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6243 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	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 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	6246 {
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	6247 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	6248 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6249 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	6250 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	6251
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6252 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	6253 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	6254 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	6255 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	6256
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6257 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	6258 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6259 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	6260 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6261 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	6262 {
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	6263 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	6264 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6265 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	6266 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	6267
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6268 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	6269 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	6270 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	6271 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	6272
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6273 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	6274 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6275 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	6276 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6277 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6278 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6279 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	6280 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6281
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6282 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6283 * 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	6284 * 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	6285 * 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	6286 * 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	6287 * 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	6288 * 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	6289 * 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	6290 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6291 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	6292 {
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	6293 _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	6294 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6295
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6296 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6297 * 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	6298 * 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	6299 * 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	6300 * 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	6301 * 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	6302 * 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	6303 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6304 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	6305 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6306 _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	6307 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6308
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6309 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6310 * 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	6311 * 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	6312 * 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	6313 * 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	6314 * 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	6315 * 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	6316 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 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	6318 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6319 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	6320 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6322 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6323 * 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	6324 * 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	6325 * 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	6326 * 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	6327 * 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	6328 * 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	6329 * 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	6330 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6331 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	6332 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6333 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	6334 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6336 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6337 * 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	6338 * 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	6339 * 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	6340 * 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	6341 * 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	6342 * 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	6343 * 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	6344 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6345 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	6346 {
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	6347 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	6348
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	6349 _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	6350 }
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
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 /*
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 * 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	6354 * 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	6355 * 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	6356 * 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	6357 * 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	6358 * 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	6359 * 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	6360 */
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 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	6362 {
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	6363 _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	6364 }
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
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 /*
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 * 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	6368 * 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	6369 * 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	6370 * 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	6371 */
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 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	6373 {
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	6374 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	6375 int flag, rc = 0;
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	6376 GtkWidget *cont = handle;
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6377 int _locked_by_me = FALSE;
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6378
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6379 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	6380 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	6381 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	6382 {
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 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	6384 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	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
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	6387 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	6388 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	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 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	6391 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	6392 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	6393 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	6394 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	6395 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	6396 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	6397 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	6398 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	6399 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	6400 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	6401 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	6402 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	6403 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	6404 }
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
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 /*
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 * 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	6408 * 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	6409 * 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	6410 * 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	6411 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6412 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	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 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	6415 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6416
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 /*
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6418 * 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	6419 * Parameters:
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6420 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6421 * 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	6422 * 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	6423 * 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	6424 * 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	6425 */
1291 b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1289 diff changeset	6426 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	6427 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6428 #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	6429 GtkWidget *cont;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6430 int _locked_by_me = FALSE;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6431 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6432 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	6433
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6434 /* 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	6435 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	6436 {
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6437 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	6438 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	6439 else
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6440 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	6441 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6442 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	6443 #endif
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6444 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6445
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6446 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6447 * 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	6448 * 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	6449 * 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	6450 * 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	6451 * 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	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 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	6454 {
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6455 GtkWidget *cont;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6456 int _locked_by_me = FALSE;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6457
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6458 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6459 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	6460
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6461 /* 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	6462 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	6463 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6464 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	6465
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6466 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	6467 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6468 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	6469 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6470 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6471 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	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
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	6474 /* 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	6475 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	6476 {
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	6477 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	6478 GtkListStore *store = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6479 int _locked_by_me = FALSE;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6480
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6481 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	6482 /* 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	6483 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	6484 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	6485
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6486 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6487 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6488 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6489
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6490 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6491 {
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	6492 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	6493 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6494
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6495 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	6496 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6497 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	6498 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6499 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6500 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	6501 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6504 * 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	6505 * 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	6506 * 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	6507 * 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	6508 * 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	6509 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6510 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	6511 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6512 _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	6513 }
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	6514
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	6515 /*
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	6516 * 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	6517 * 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	6518 * 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	6519 * 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	6520 * 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	6521 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6522 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	6523 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6524 _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	6525 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6526
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6527 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6528 * 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	6529 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6530 * 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	6531 * 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	6532 * 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	6533 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6534 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	6535 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6536 _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	6537 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6538
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6539 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6540 * 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	6541 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6542 * 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	6543 * 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	6544 * 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	6545 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6546 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	6547 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6548 _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	6549 }
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	6550
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	6551 /*
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	6552 * 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	6553 * 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	6554 * 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	6555 * 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	6556 * 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	6557 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6558 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	6559 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6560 /* 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	6561 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6562
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6563 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6564 * 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	6565 * 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	6566 * 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	6567 * 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	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 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	6570 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6571 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6572 GtkListStore *store = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6573 int _locked_by_me = FALSE;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6574
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6575 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	6576 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	6577
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6578 /* 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	6579 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	6580 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	6581
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6582 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6583 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6584 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6585 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	6586
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	6587 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	6588
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6589 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	6590 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6591 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	6592 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	6593 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6594
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6595 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	6596 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6597 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6598 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6599
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6600 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	6601 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6602 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	6603 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6604
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6605 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6606 * 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	6607 * 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	6608 * 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	6609 * 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	6610 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6611 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	6612 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6613 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6614 GtkListStore *store = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6615 int _locked_by_me = FALSE;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6616
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6617 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	6618 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	6619
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6620 /* 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	6621 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	6622 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	6623
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6624 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6625 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6626 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	6627 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	6628
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6629 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	6630 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6631 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	6632 }
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
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 /*
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 * 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	6636 * 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	6637 * 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	6638 * 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	6639 * 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	6640 * 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	6641 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6642 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	6643 {
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6644 GtkWidget *cont;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6645 int _locked_by_me = FALSE;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6646
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6647 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6648 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	6649
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6650 /* 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	6651 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	6652 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	6653 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	6654
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6655 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6656 {
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	6657 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	6658 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6659 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6660 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	6661 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6662
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6663 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6664 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6665 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6666 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6667 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6668 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6669
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6670 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6671
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6672 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6673 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6674 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6675 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6676 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6677 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6678 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6679 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6680 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6681 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6682 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6683 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6684 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6685 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6686 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6687 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6688 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6689 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6690 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6691 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6692 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6693 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6694 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6695 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6696 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6697 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6698 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6699 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6700 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6701 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6702 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6703 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6704 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6705 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6706 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6707 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6711 * 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	6712 * 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	6713 * 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	6714 * 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	6715 * 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	6716 * 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	6717 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6718 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	6719 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6720 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6721 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	6722 char *retval = 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	6723 int _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	6724 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	6725
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6726 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	6727 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	6728
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6729 /* 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	6730 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	6731 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	6732
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6733 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6734 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6735 /* 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	6736 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	6737 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6738 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	6739 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	6740 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6741 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6742 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	6743
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6744 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6745 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6746 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	6747
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6748 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6749 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6750 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6751
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6752 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	6753 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6754 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	6755 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	6756 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6757 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6758 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6759 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	6760 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	6761 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6762 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6763 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	6764 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6765 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6766
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6767 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	6768 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6769 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6770 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6771
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6772 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	6773 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6774 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	6775 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6776 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	6777 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6778 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6779 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6780 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6781 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6782
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6783 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	6784 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6785 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	6786 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	6787 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6788 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6789 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6790 /* 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	6791 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	6792 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6793 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6794 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6795 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6796 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6797 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	6798 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	6799 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6800
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6801 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6802 * 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	6803 * 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	6804 * 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	6805 * 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	6806 * 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	6807 * 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	6808 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6809 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	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 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6812 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	6813 char *retval = 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	6814 int _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	6815 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	6816
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6817 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	6818 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	6819
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6820 /* 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	6821 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	6822 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	6823
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6824 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6825 {
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	6826 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	6827 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	6828
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6829 /* 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	6830 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	6831 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6832 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	6833 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	6834
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6835 if(list)
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 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	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(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6840 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6841 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	6842
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6843 if(indices)
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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6846
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6847 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	6848 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6849 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	6850 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	6851 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6852 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6853 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6854 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	6855 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	6856 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6857 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6858 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	6859 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6860 /* 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	6861 * 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	6862 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6863 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6864 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6865 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6866 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6867 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6868
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6869 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	6870 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6871 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	6872 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	6873 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6874 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6875 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6876 /* 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	6877 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	6878 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6879 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6880 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6881 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6882 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6883 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	6884 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	6885 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6887 int _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	6888 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6889 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	6890 void *thisdata;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6891 int retval = FALSE;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6892
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6893 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	6894 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6895 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	6896 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6897 /* 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	6898 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	6899 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	6900 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6901 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6902 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	6903 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6904 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6905 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6906 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6907 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6908 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	6909 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6910
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6911 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	6912 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6913 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6914 GtkListStore *store = NULL;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6915 int _locked_by_me = FALSE;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6916
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6917 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6918 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	6919
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6920 /* 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	6921 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	6922 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	6923
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6924 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6925 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6926 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6927
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6928 if(_find_iter(store, &iter, data, textcomp))
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6929 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6930 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	6931
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6932 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6933 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6934 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	6935 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	6936 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6937 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6938 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6939 DW_MUTEX_UNLOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6940 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6941
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6943 * 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	6944 * 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	6945 * 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	6946 * 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	6947 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6948 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	6949 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6950 _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	6951 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6952
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6953 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6954 * 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	6955 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6956 * 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	6957 * 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	6958 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6959 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	6960 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6961 _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	6962 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6963
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6964 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	6965 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6966 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6967 GtkListStore *store = NULL;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6968 int _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	6969
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6970 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	6971 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	6972
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6973 /* 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	6974 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	6975 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	6976
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6977 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6978 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6979 GtkTreeIter iter;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6980 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	6981
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6982 if(_find_iter(store, &iter, data, textcomp))
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 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	6985 rows--;
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
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6988 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	6989 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6990 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	6991 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6992
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6993 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6994 * 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	6995 * 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	6996 * 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	6997 * 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	6998 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6999 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	7000 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7001 _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	7002 }
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 * 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	7006 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7007 * 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	7008 * 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	7009 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7010 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	7011 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	7012 _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	7013 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7015 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7016 * 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	7017 * 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	7018 * 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	7019 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7020 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	7021 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7022 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7023 int _locked_by_me = FALSE;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7024
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7025 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	7026 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	7027
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	7028 /* 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	7029 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	7030 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	7031 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	7032 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7033
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7034 /* Translate the status message into a message on our buddy window */
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7035 static void _status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7036 {
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7037 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7038 long x, y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7039 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	7040
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7041 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	7042
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7043 event.button = button;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7044 event.x = x;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7045 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	7046
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7047 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	7048 }
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7049
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7050 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7051 * 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	7052 * 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	7053 * 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	7054 * 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	7055 * 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	7056 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7057 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	7058 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7059 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7060 GdkPixbuf *pixbuf;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7061 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7062
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7063 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7064 pixbuf = _find_pixbuf(icon, NULL, NULL);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7065 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7066 if(bubbletext)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7067 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7068 g_object_set_data(G_OBJECT(handle), "_dw_taskbar", status);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7069 g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_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	7070 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	7071 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	7072 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7074 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7075 * 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	7076 * 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	7077 * 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	7078 * 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	7079 */
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 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	7081 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7082 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7083 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7084
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7085 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7086 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	7087 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7088 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	7089 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7090
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7091 /* 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	7092 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	7093 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7094 _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	7095 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7096
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7097 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7098 * 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	7099 * 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	7100 * 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	7101 * 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	7102 * 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	7103 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7104 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	7105 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7106 int _locked_by_me = 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	7107 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	7108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7109 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	7110 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	7111 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	7112 \| 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	7113 \| 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	7114 \| 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	7115 \| 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	7116 \| 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	7117 \| 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	7118 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	7119 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	7120 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	7121 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	7122 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	7123 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	7124 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	7125 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	7126 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7127
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7128 /* Returns a GdkRGBA from a DW color */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7129 static GdkRGBA _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	7130 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7131 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	7132 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7133 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	7134 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	7135 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 if (value < 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	7137 return _colors[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	7138 return _colors[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	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 /* 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	7142 * 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	7143 * 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	7144 * 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	7145 * 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	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_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	7148 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7149 GdkRGBA color = _internal_color(value);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7150 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	7151
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7152 *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	7153 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7155 /* 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	7156 * 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	7157 * 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	7158 * 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	7159 * 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	7160 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7161 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	7162 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7163 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	7164
775 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 if(value == DW_CLR_DEFAULT)
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7166 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7167 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7168 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7169 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	7170 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7171 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7172 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7173 else
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7174 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7175 GdkRGBA color = _internal_color(value);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7176
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7177 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7178 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7179 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	7180 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	7181 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7182 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7183 }
775 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 }
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
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7186 #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	7187 /* 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	7188 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7189 * 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	7190 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7191 * 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	7192 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7193 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	7194 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7195 GtkColorChooser *cd;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7196 GdkRGBA color = _internal_color(value);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7197 int _locked_by_me = FALSE;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7198 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	7199
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7200 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	7201 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	7202 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	7203 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	7204
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7205 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	7206
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7207 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	7208 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7209 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	7210 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	7211 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7212 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	7213 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	7214 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7215 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7216 #else
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7217 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	7218
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 /* Internal function to handle the color OK 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	7220 static gint _gtk_color_ok(GtkWidget widget, 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	7221 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7222 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	7223 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	7224 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	7225
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 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	7227 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	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 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	7230 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	7231 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	7232 _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	7233 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	7234 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	7235 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	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
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 /* Internal function to handle the color Cancel 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	7239 static gint _gtk_color_cancel(GtkWidget widget, 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	7240 {
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 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	7242 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	7243
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 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	7245 _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	7246 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	7247 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	7248 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7249
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7250 /* 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	7251 * 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	7252 * 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	7253 * 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	7254 * 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	7255 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7256 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	7257 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7258 GtkWidget colorw, ok_button, *cancel_button;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7259 int _locked_by_me = 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	7260 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	7261 GtkColorSelection *colorsel;
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7262 GdkRGBA color = _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	7263 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	7264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7265 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	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 /* 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	7268 * 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	7269 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7270 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	7271 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7272 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	7273 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	7274 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7275
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7276 _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	7277
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7278 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	7279
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280 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	7281
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282 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	7283 g_object_get(G_OBJECT(colorw), "ok-button", &ok_button, "cancel-button", &cancel_button, NULL);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7284 g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(_gtk_color_ok), dwwait);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7285 g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(_gtk_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	7286
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7287 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	7288 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	7289 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	7290
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7291 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	7292
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7293 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	7294 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	7295 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	7296 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	7297 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	7298 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7299 #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	7300
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 /* 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	7302 * 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	7303 * 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	7304 * 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	7305 * 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	7306 * 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	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 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	7309 {
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 int _locked_by_me = 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	7311 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7312 #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	7313 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	7314 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7315 #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	7316
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 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	7318 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7319 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7320 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	7321
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7322 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7323 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7324 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	7325 /* 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	7326 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	7327 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7328 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7329 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7330 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7331 #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	7332 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	7333 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	7334 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	7335 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7336 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	7337 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7338 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7339 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7340 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7341 /* 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	7342 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	7343 _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	7344 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7345 }
775 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 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	7347 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	7348 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	7349 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7350 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	7351
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7352 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	7353 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	7354 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	7355 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7356 #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	7357 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	7358 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7359 /* 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	7360 * 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	7361 */
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	7362 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	7363 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	7364 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7365 #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	7366 cairo_destroy(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	7367 }
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 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	7369 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7370
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 /* 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	7372 * 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	7373 * 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	7374 * 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	7375 * 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	7376 * 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	7377 * 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	7378 * 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	7379 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7380 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	7381 {
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 int _locked_by_me = 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	7383 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7384 #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	7385 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	7386 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7387 #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	7388
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 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	7390 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7391 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7392 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	7393
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7394 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7395 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7396 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	7397 /* 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	7398 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	7399 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7400 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7401 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7402 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7403 #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	7404 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	7405 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	7406 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	7407 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7408 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	7409 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7410 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7411 else
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 /* 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	7414 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	7415 _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	7416 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7417 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7418 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	7419 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	7420 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	7421 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7422 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	7423
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7424 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	7425 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	7426 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	7427 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	7428 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7429 #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	7430 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	7431 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7432 /* 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	7433 * 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	7434 */
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	7435 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	7436 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	7437 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7438 #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	7439 cairo_destroy(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	7440 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7441 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	7442 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7443
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7444 /* 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	7445 * 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	7446 * 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	7447 * 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	7448 * 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	7449 * 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	7450 * 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	7451 * 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	7452 */
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	7453 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	7454 {
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 int _locked_by_me = 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	7456 cairo_t *cr = 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	7457 int z;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7458 #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	7459 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	7460 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7461 #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	7462
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 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	7464 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7465 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7466 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	7467
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7468 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7469 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7470 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	7471 /* 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	7472 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	7473 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7474 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7475 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7476 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7477 #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	7478 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	7479 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	7480 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	7481 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7482 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	7483 #endif
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 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7486 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7487 /* 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	7488 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	7489 _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	7490 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7491 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7492 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	7493 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	7494 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	7495 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7496 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	7497
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7498 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	7499 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	7500
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7501 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	7502 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	7503 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	7504 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	7505 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7506 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	7507 }
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	7508 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	7509 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	7510 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7511 #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	7512 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	7513 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7514 /* 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	7515 * 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	7516 */
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	7517 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	7518 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	7519 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7520 #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	7521 cairo_destroy(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	7522 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 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	7524 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7526 /* 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	7527 * 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	7528 * 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	7529 * 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	7530 * 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	7531 * 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	7532 * 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	7533 * 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	7534 * 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	7535 */
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	7536 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	7537 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7538 int _locked_by_me = 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	7539 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7540 #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	7541 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	7542 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7543 #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	7544
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7545 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	7546 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7547 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7548 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	7549
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7550 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7551 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7552 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	7553 /* 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	7554 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	7555 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7556 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7557 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7558 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7559 #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	7560 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	7561 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	7562 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	7563 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7564 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	7565 #endif
2343 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 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7568 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7569 /* 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	7570 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	7571 _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	7572 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7573 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574 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	7575 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	7576 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	7577 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7578 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	7579
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7580 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	7581 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	7582
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7583 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	7584 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	7585 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	7586 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	7587 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	7588 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	7589 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	7590 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	7591 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7592 #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	7593 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	7594 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7595 /* 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	7596 * 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	7597 */
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	7598 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	7599 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	7600 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7601 #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	7602 cairo_destroy(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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7604 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	7605 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7606
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7607 /* 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	7608 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7609 * 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	7610 * 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	7611 * 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	7612 * 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	7613 * 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	7614 * 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	7615 * 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	7616 * 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	7617 * 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	7618 * 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	7619 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7620 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	7621 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7622 int _locked_by_me = FALSE;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7623 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7624 #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	7625 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	7626 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7627 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7628
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7629 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	7630 if(handle)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7631 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7632 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	7633
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7634 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7635 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7636 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	7637 /* 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	7638 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	7639 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7640 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7641 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7642 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7643 #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	7644 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	7645 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	7646 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	7647 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7648 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	7649 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7650 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7651 else
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 /* 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	7654 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	7655 _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	7656 }
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7657 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7658 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	7659 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	7660 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7661 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7662 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	7663 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	7664 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	7665
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7666 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	7667 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	7668
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7669 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	7670 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	7671 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7672 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	7673 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	7674 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	7675 else
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7676 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7677 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	7678 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	7679 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	7680 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	7681 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	7682
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	7683 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	7684 }
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	7685 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	7686 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	7687 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7688 #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	7689 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	7690 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7691 /* 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	7692 * 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	7693 */
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	7694 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	7695 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	7696 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7697 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7698 cairo_destroy(cr);
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7699 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7700 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	7701 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7702
775 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 /* 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	7704 * 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	7705 * 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	7706 * 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	7707 * 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	7708 * 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	7709 * 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	7710 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7711 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	7712 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 int _locked_by_me = 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	7714 cairo_t *cr = 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	7715 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	7716 char tmpname, fontname = "monospace 10";
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7717 #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	7718 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	7719 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7720 #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	7721
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7722 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	7723 return;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7724
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 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	7726 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	7727 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7728 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	7729
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7730 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(handle), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7731 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7732 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	7733 /* 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	7734 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	7735 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7736 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7737 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7738 }
2344 88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2343 diff changeset	7739 #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	7740 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	7741 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	7742 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	7743 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7744 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	7745 #endif
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7746 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	7747 fontname = tmpname;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7748 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7749 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7750 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	7751 /* 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	7752 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	7753 _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	7754 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7756 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	7757 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7758 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7759 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7760 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	7761 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	7762 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	7763 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7764 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	7765 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7766 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	7767 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	7768 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7769 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	7770
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7771 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	7772 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7773 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	7774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7775 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	7776 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7777 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	7778 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	7779
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7780 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	7781 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	7782
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7783 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	7784 /* 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	7785 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	7786 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7787 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	7788 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	7789 (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	7790 (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	7791 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	7792 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7793 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	7794 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7795 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	7796 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	7797 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7798 /* 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	7799 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	7800 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	7801
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7802 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	7803 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7804 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	7805 }
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 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	7807 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7808 #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	7809 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	7810 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7811 /* 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	7812 * 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	7813 */
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	7814 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	7815 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	7816 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7817 #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	7818 cairo_destroy(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	7819 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7820 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	7821 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7823 /* 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	7824 * 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	7825 * 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	7826 * 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	7827 * 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	7828 * 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	7829 * 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	7830 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7831 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	7832 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7833 int _locked_by_me = 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	7834 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	7835 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	7836 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	7837
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838 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	7839 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	7840
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7841 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	7842 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	7843 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7844 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	7845 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	7846 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 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	7848 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	7849 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7850 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851 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	7852 {
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	7853 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	7854 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	7855 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	7856 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	7857 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7859 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	7860 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	7861 {
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 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	7863
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7864 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	7865 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7866 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	7867
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868 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	7869 {
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 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	7871
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 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	7873 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	7874 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	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(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	7877 *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	7878 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	7879 *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	7880
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 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	7882 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7883 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	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_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	7886 }
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 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	7888 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	7889 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	7890 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7891
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7892 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7893 * 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	7894 * 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	7895 * 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	7896 * 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	7897 * 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	7898 * 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	7899 * 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	7900 * 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	7901 * 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	7902 * 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	7903 */
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 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	7905 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7906 int _locked_by_me = 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	7907 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	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 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	7910 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	7911
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 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	7913 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	7914
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7915 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	7916
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7918 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	7919 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	7920 /* 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	7921 * 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	7922 */
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7923 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	7924 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	7925 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	7926 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	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 /*
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 * 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	7931 * 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	7932 * 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	7933 * 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	7934 * 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	7935 * (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	7936 * 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	7937 * 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	7938 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7939 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	7940 {
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 int _locked_by_me = 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	7942 HPIXMAP pixmap;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	7943 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	7944 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	7945 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	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 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	7948 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	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 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	7951
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 /* 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	7953 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	7954 {
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 /* 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	7956 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	7957 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7958 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	7959 strcat( file, image_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	7960 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	7961 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7962 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	7963 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	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 }
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 ( 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	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 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	7969 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	7970 }
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
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 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	7974 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	7975 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	7976 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	7977 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	7978 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	7979 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	7980 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	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
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 /*
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 * 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	7985 * 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	7986 * 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	7987 * 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	7988 * 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	7989 * (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	7990 * 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	7991 * 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	7992 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7993 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	7994 {
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	7995 int fd, written = -1, _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	7996 HPIXMAP pixmap;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7997 char template[] = "/tmp/dwpixmapXXXXXX";
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7998
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7999 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	8000 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	8001
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 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	8003 /*
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 * 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	8005 * 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	8006 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8007 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	8008 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8009 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	8010 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	8011 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	8012 /* 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	8013 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	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 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	8016 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	8017 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	8018 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	8019 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	8020 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	8021 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	8022 /* 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	8023 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	8024 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	8025 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	8026 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	8027 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 * 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	8031 * 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	8032 * 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	8033 * 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	8034 * 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	8035 * 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	8036 * 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	8037 */
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 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	8039 {
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 }
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
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 /*
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 * 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	8044 * 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	8045 * 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	8046 * 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	8047 * 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	8048 * 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	8049 */
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 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	8051 {
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 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	8053 int _locked_by_me = 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	8054
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 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	8056 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	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
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 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	8060 pixmap->pixbuf = gdk_pixbuf_copy(_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	8061 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	8062 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	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
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8065 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	8066 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8067 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	8068 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	8069 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8070
775 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 /* 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	8072 * 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	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 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	8075 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8076 int _locked_by_me = FALSE;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8077
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8078 DW_MUTEX_LOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8079 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	8080 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	8081 _dw_dirty_list = NULL;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8082 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	8083 }
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
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 /*
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8086 * 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	8087 * 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	8088 * 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	8089 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8090 * 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	8091 * 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	8092 * 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	8093 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8094 * 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	8095 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8096 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	8097 {
2248 4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8098 if(pixmap)
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8099 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8100 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	8101
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8102 pixmap->font = _convert_font(fontname);
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2243 diff changeset	8103
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8104 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8105 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8106 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8107 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8108 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8109 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8110
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8111 /*
775 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 * 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	8113 * 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	8114 * 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	8115 * 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	8116 */
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 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	8118 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8119 int _locked_by_me = 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	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_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	8122 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	8123 cairo_surface_destroy(pixmap->image);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8124 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	8125 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	8126 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	8127 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	8128 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129
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 /*
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 * 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	8132 * 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	8133 * 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	8134 * 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	8135 * 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	8136 * 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	8137 * 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	8138 * 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	8139 * 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	8140 * 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	8141 * 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	8142 * 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	8143 */
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8144 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	8145 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8146 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	8147 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8148
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8149 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8150 * 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	8151 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8152 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8153 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8154 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8155 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8156 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8157 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8158 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8159 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8160 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8161 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8162 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8163 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8164 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8165 * 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	8166 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8167 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	8168 {
775 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 int _locked_by_me = 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	8170 cairo_t *cr = NULL;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8171 int retval = DW_ERROR_GENERAL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8172 #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	8173 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	8174 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8175 #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	8176
1177 c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1161 diff changeset	8177 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	8178 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	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 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	8181 if(dest)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8182 {
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8183 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	8184
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8185 if((display && GDK_IS_X11_DISPLAY(display)) \|\| g_object_get_data(G_OBJECT(dest), "_dw_expose"))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8186 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8187 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	8188 /* 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	8189 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	8190 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8191 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8192 return retval;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8193 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8194 #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	8195 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	8196 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	8197 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	8198 #else
2343 347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8199 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	8200 #endif
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8201 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8202 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8203 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2342 diff changeset	8204 /* 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	8205 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	8206 _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	8207 }
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8208 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8209 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	8210 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	8211
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8212 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	8213 {
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8214 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	8215
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8216 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8217 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8218 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8219 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8220 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8221 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8222
775 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 if(src)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8224 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	8225 else if(srcp)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8226 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	8227
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8228 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	8229 cairo_fill(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8230 #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	8231 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	8232 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8233 /* 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	8234 * 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	8235 */
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	8236 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	8237 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	8238 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8239 #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	8240 cairo_destroy(cr);
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8241 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8242 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8243 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8244 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	8245 }
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
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 /*
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 * 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	8249 * 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	8250 * 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	8251 * 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	8252 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 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	8254 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 int _locked_by_me = 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	8256
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 DW_MUTEX_LOCK;
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	8258 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	8259 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	8260 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8261
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8262 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	8263 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8264 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	8265
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8266 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	8267 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8268 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	8269 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	8270 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8271 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8272
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 /* 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	8274 * 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	8275 * 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	8276 * 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	8277 * 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	8278 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8279 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	8280 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8281 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	8282 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	8283 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	8284
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8285
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 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	8287 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	8288
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8289 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	8290 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	8291
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8292 /* 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	8293 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	8294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8295 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	8296 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	8297
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 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	8299 _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	8300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8301 *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	8302 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	8303 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 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	8305 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	8306 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	8307 *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	8308 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 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	8311
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8312 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	8313 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8315 /* 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	8316 * 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	8317 * 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	8318 * 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	8319 * 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	8320 * 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	8321 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8322 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	8323 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 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	8325 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	8326
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8327 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	8328 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	8329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 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	8331 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	8332 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333
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 /* 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	8335 * 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	8336 * 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	8337 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8338 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	8339 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340 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	8341 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	8342 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	8343 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 * 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	8347 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348 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	8349 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 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	8351
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8352 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	8353 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	8354 }
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 * 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	8358 * 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	8359 * 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	8360 */
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 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	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 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	8364 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8365 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	8366 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	8367 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8368 }
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
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 * 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	8372 * 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	8373 * 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	8374 */
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 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	8376 {
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 /* 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	8378 * 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	8379 */
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 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	8381 _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	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 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	8384
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 /* 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	8386 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	8387 _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	8388 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8389
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 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8391 * 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	8392 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8393 * 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	8394 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8395 * 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	8396 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8397 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	8398 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8399 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	8400 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	8401 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	8402 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8403
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8404 /*
775 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 * 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	8406 * 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	8407 * 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	8408 */
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 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	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 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	8412 }
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 /*
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 * 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	8416 */
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 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	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 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	8420
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 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	8422 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	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 /* 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	8425 * 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	8426 * 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	8427 */
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 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	8429 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	8430 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	8431
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8432 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	8433 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	8434 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	8435
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 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	8437 }
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
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 * 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	8441 * 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	8442 * 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	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 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	8445 {
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 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	8447 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	8448
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 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	8450 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	8451 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	8452 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	8453 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	8454 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	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
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 * 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	8459 * 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	8460 * 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	8461 * 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	8462 */
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 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	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 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	8466 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	8467
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 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	8469 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	8470 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	8471 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	8472 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	8473 }
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 /*
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 * 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	8477 * 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	8478 * 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	8479 * 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	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 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	8482 {
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 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	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 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	8486 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	8487
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8488 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	8489
775 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(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	8491 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8492 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	8493 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	8494 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8495
1156 03b6d9fdfac0 Fixed a typo on Unix... timeout not time. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	8496 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	8497 {
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	8498 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	8499 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	8500
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	8501 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	8502 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	8503 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	8504 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	8505 }
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	8506 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	8507 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	8508
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509 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	8510 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	8511 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	8512 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	8513 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	8514 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	8515 }
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
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 /*
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 * 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	8519 * 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	8520 * 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	8521 */
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 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	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 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	8525 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	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 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	8528 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	8529 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	8530 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	8531 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	8532 *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	8533
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	8534 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	8535 }
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
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 struct _seminfo {
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 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	8539 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	8540 };
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 static void _handle_sem(int *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	8543 {
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 fd_set 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	8545 struct _seminfo array = (struct _seminfo )malloc(sizeof(struct _seminfo));
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 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	8547 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	8548 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	8549 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	8550
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 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	8552 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	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 /* 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	8555 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	8556 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8557 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	8558 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	8559 }
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
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 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	8562 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	8563
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564 /* 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	8565 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	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 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	8568 {
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 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	8570 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	8571 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	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 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	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 /* 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	8576 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	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 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	8579 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	8580
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 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	8582 }
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 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	8585 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8586 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	8587 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	8588 }
775 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
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 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	8591 {
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 struct _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	8593 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	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(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	8596 {
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 /* Add new connections to the 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	8598 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount+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	8599 memcpy(newarray, array, sizeof(struct _seminfo)*(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	8600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601 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	8602 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	8603
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8604 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	8605
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8606 /* 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	8607 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	8608 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	8609 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8610 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8611
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 /* 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	8613 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	8614 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8615 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	8616 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 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	8618 {
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 struct _seminfo *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	8620
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8621 /* Remove this connection from the 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	8622 newarray = (struct _seminfo )malloc(sizeof(struct _seminfo)(connectcount-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	8623 if(!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	8624 memcpy(newarray, &array[1], sizeof(struct _seminfo)*(connectcount-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	8625 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	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 memcpy(newarray, array, sizeof(struct _seminfo)*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	8628 if(z!=(connectcount-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	8629 memcpy(&newarray[z], &array[z+1], sizeof(struct _seminfo)*(z-connectcount-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	8630 }
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 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	8632
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 /* 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	8634 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	8635 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	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 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	8638 {
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 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	8640 {
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 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	8642 {
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 /* 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	8644 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	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 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	8647 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	8648 /* 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	8649 {
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 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	8651 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	8652
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 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	8654
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8655 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	8656 {
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 /* 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	8658 * 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	8659 * 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	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 if(array[s].waiting)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8662 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	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 }
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 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	8666 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	8667 /* 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	8668 {
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 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	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[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	8672
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 /* 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	8674 if(posted)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8675 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	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 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	8678 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	8679 {
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 /* 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	8681 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	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 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	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 }
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 }
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 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8688 }
775 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 }
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 /* 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	8692 /* 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	8693 * 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	8694 * 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	8695 * 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	8696 * 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	8697 * 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	8698 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8699 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	8700 {
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 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	8702 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	8703 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	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(!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	8706 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	8707
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8708 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	8709 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	8710 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	8711 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	8712 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	8713 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	8714 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	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 /* 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	8717 * 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	8718 */
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 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	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 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	8722 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	8723 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	8724 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	8725
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 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	8727 {
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 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	8729 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	8730 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	8731 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	8732 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	8733 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	8734 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	8735 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	8736 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8737
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 /* Create a thread to handle this 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	8739 pthread_create(&dwthread, NULL, (void )_handle_sem, (void )tmpsock);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8740 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	8741 }
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 /* 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	8744 * 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	8745 * 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	8746 * 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	8747 * 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	8748 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8749 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	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 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	8752 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	8753 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	8754 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	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 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	8757 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	8758 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	8759 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	8760 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	8761 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	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
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 /* 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	8765 * 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	8766 * 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	8767 * 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	8768 * 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	8769 */
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 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	8771 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8772 /* 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	8773 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	8774
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8775 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8776 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8777
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8778 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	8779 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8780 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	8781 }
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 /* 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	8784 * 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	8785 * 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	8786 * 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	8787 * 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	8788 */
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 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	8790 {
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
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 /* 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	8793 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	8794
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8795 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8796 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8797
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8798 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	8799 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8800 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	8801 }
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
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 /* 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	8804 * 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	8805 * 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	8806 * 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	8807 * 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	8808 * 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	8809 * 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	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 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	8812 {
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 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	8814 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	8815 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	8816 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	8817
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8818 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	8819 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	8820
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 /* 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	8822 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	8823 {
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 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	8825 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	8826
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 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	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
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 FD_ZERO(&rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8831 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	8832
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 /* 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	8834 tmp = (char)2;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8835 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	8836
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8837 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8838 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	8839
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 /* 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	8841 tmp = (char)3;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8842 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8843 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	8844
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 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	8846 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	8847 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	8848 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	8849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8850 /* 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	8851 * 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	8852 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8853 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	8854 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8855 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	8856 }
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
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 /* 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	8859 * 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	8860 * 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	8861 * 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	8862 * 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	8863 */
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 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	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 /* Finally close the domain socket,
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 * cleanup will continue in _handle_sem.
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 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8869 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8870 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	8871 }
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
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8873 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8874 * 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	8875 * 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	8876 * 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	8877 * 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	8878 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8879 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8880 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8881 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8882
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8883 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	8884 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	8885 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	8886 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8887
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8888 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8889 * 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	8890 * 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	8891 * 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	8892 * 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	8893 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8894 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8895 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8896 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	8897
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8898 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	8899 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8900 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	8901 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8902 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8903
775 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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8905 * 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	8906 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8907 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	8908 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8909 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	8910 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	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 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	8913
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8914 /* Initialize colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8915 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8916
775 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 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	8918 free(tmp);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8919
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8920 /* Free colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8921 _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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8924 /*
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 * 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	8926 * 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	8927 * 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	8928 * 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	8929 * 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	8930 * 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	8931 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8932 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	8933 {
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	8934 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	8935 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	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 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	8938 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	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 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	8941 {
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 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	8943 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	8944 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8945
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8946 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8947 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8948 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8949 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8950 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8951 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8952
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8953 /* 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	8954 *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	8955
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 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	8957 {
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 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	8959 *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	8960 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	8961 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	8962 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8963
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8964 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	8965 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	8966 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	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 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	8969 }
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
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 /*
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 * 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	8973 * 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	8974 * 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	8975 * 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	8976 * 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	8977 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8978 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	8979 {
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	8980 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	8981 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	8982
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8983 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	8984 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	8985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8986 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	8987 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8988 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	8989 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	8990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8991
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8992 /* 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	8993 *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	8994
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8995 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	8996 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8997 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	8998 *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	8999 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	9000 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	9001 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9002
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9003 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	9004 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	9005 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	9006
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9007 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	9008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9009
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9010 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9011 * 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	9012 * 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	9013 * 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	9014 * 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	9015 */
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 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	9017 {
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 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	9019 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	9020
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 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	9022 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	9023 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9024 /* 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	9025 * 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	9026 */
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 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	9028 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	9029 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	9030 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9031 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	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 * 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	9035 * 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	9036 * 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	9037 * 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	9038 * 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	9039 */
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 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	9041 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9042 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	9043 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	9044 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	9045
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 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	9047 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	9048
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 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	9050 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	9051 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	9052 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	9053 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9056 * 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	9057 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9058 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	9059 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9060 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	9061 }
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 /*
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 * 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	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 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	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 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	9069 }
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
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 /*
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 * 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	9073 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9074 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	9075 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9076 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9077
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9078 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	9079 * 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	9080 * 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	9081 * 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	9082 */
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 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	9084 {
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 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	9086 }
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
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	9088 /* Internal function to get the recommended size of scrolled items */
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	9089 void _get_scrolled_size(GtkWidget item, gint thiswidth, gint *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	9090 {
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	9091 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	9092
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	9093 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	9094
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	9095 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	9096 {
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	9097 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	9098 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	9099 /* 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	9100 *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	9101 *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	9102 }
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	9103 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	9104 {
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	9105 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	9106 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	9107 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	9108 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	9109 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	9110 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	9111
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	9112 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	9113
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	9114 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	9115
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	9116 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	9117 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	9118 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	9119 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	9120
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	9121 /* 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	9122 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	9123 {
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	9124 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	9125 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	9126 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	9127 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	9128 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	9129 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	9130
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	9131 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	9132 {
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	9133 *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	9134 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	9135 }
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	9136 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	9137 {
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	9138 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	9139 {
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	9140 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	9141 {
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	9142 *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	9143 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	9144 }
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	9145 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	9146 *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	9147 }
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	9148 }
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	9149 *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	9150 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	9151 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	9152 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	9153 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	9154 }
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	9155 if(hscrolled)
1563 90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1562 diff changeset	9156 *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	9157 }
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	9158 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	9159 {
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	9160 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	9161 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	9162
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	9163 *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	9164 *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	9165 }
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	9166 }
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	9167 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	9168 *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	9169 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	9170 *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	9171 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	9172 *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	9173 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	9174 *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	9175 }
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	9176
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9177 /* 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	9178 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	9179 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9180 int warn = FALSE, _locked_by_me = 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	9181 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	9182
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9183 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	9184 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	9185
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9186 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9187 * 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	9188 * 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	9189 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9190 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	9191 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9192 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	9193 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	9194 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9195
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9196 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	9197
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9198 /* 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	9199 * 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	9200 */
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	9201 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	9202 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	9203
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9204 /* 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	9205 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	9206 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9207 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	9208 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	9209 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	9210 }
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9211 /* 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	9212 * 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	9213 */
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	9214 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	9215 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9216 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	9217
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	9218 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	9219 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9220 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	9221 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	9222
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	9223 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	9224 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	9225 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	9226 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	9227
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9228 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	9229 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	9230 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	9231 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9232 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9233
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9234 /* 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	9235 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	9236
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9237 /* 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	9238 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	9239 {
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	9240 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	9241 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	9242
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9243 /* 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	9244 * 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	9245 * 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	9246 * 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	9247 */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9248 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	9249 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9250 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	9251
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9252 /* 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	9253 * 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	9254 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9255 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	9256
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9257 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	9258 {
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	9259 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	9260 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	9261 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	9262 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	9263 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9264 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9265 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	9266 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9267 /* 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	9268 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	9269 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9270
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9271 /* 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	9272 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	9273 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	9274 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	9275 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	9276
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9277 #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	9278 /* 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	9279 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	9280 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9281 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	9282
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9283 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	9284 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9285 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	9286 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	9287 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9288 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9289 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	9290 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9291 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	9292
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9293 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	9294 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9295 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	9296 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	9297 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9298 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9299 #endif
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9300
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9301 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	9302 /* 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	9303 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	9304 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	9305 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	9306 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	9307 /* 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	9308 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	9309 /* 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	9310 * 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	9311 */
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	9312 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	9313 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9314 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	9315 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	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 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	9318 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9319 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	9320 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	9321 }
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	9322 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	9323 /* 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	9324 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	9325 {
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	9326 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	9327
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	9328 /* 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	9329 if((width < 1 && !hsize) \|\| (height < 1 && !vsize))
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	9330 _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	9331
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9332 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	9333 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	9334 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	9335 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	9336 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	9337 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	9338 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	9339 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	9340 }
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 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	9342 {
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9343 /* 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	9344 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	9345 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	9346 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	9347 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	9348 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	9349 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	9350 }
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	9351 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	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 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	9354 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	9355
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 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	9357 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9358 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	9359 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	9360 }
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 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	9362 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	9363 }
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	9364 /* 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	9365 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	9366 {
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	9367 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	9368 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	9369 }
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 }
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 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	9372
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 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	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 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	9376 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	9377 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	9378 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	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
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 /*
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	9383 * 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	9384 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9385 * 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	9386 * 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	9387 * 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	9388 */
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	9389 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	9390 {
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	9391 int _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	9392
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	9393 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	9394 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	9395 {
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	9396 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	9397 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	9398
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	9399 /* 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	9400 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	9401 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	9402
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9403 /* 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	9404 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	9405 {
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	9406 /* 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	9407 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	9408 #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	9409 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	9410 #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	9411
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	9412 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	9413 {
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	9414 /* 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	9415 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	9416 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	9417 }
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	9418 /* 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	9419 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	9420 {
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	9421 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	9422 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	9423 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9424 /* 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	9425 #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	9426 /* 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	9427 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	9428 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9429 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	9430
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9431 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	9432 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9433 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	9434 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9435 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	9436 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9437 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9438 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9439 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9440 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9441 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9442 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	9443
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9444 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	9445 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9446 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	9447 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9448 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	9449 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9450 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9451 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9452 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9453 #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	9454 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	9455 #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	9456 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	9457 }
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	9458 }
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	9459 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	9460 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	9461 }
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	9462
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	9463 /*
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	9464 * 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	9465 * 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	9466 * 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	9467 * 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	9468 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9469 * 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	9470 */
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	9471 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	9472 {
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9473 int _locked_by_me = FALSE;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9474 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	9475
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9476 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	9477 /* 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	9478 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9479 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9480 /* 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	9481 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	9482 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	9483 #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	9484 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	9485 #else
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9486 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9487
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9488 /* 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	9489 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9490 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9491 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9492
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9493 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	9494 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9495 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	9496 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9497 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9498 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	9499 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9500 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9501 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9502 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9503
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9504 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	9505 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9506 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	9507 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9508 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9509 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	9510 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9511 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9512
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9513 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9514 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9515 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9516 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9517 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	9518 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9519 /* 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	9520 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	9521 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	9522 else if(item)
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9523 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9524 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	9525 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9526 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	9527 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	9528 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9529 /* 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	9530 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	9531 #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	9532 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	9533 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	9534 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9535 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	9536 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9537 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9538 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9539 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9540 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9541 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	9542 }
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	9543
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	9544 /*
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9545 * 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	9546 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9547 * 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	9548 * 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	9549 * 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	9550 * 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	9551 * 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	9552 * 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	9553 * 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	9554 * 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	9555 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9556 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	9557 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9558 _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	9559 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9560
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9561 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9562 * 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	9563 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9564 * 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	9565 * 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	9566 * 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	9567 * 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	9568 * 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	9569 * 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	9570 * 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	9571 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9572 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	9573 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9574 /* 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	9575 * 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	9576 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9577 _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	9578 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9579
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9580 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 * 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	9582 * 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	9583 * 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	9584 * 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	9585 * 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	9586 * 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	9587 * 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	9588 * 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	9589 * 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	9590 */
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9591 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	9592 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9593 _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	9594 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9596
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9597 union extents_union { guchar gu_extents; unsigned long extents; };
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9598 static GdkAtom extents_atom = 0;
1479 1d414e81a099 FIXME: Workaround on GTK for Compiz not sending property notify bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1477 diff changeset	9599 static time_t 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	9600
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9601 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	9602 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9603 /* Check to see if we got a property change */
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9604 if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == extents_atom && event->window == gdkwindow)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9605 extents_time = 0;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9606 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	9607 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9608
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9609 /* 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	9610 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	9611 {
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	9612 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	9613 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9614 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	9615 unsigned long *extents = NULL;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9616 union extents_union eu;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9617 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	9618 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	9619 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	9620
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9621 if(!extents_atom)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9622 extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9623
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	9624 /* 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	9625 *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	9626 *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	9627
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9628 /* 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	9629 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	9630 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9631 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	9632 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	9633 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	9634 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	9635 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	9636 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9637 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9638 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	9639
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9640 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	9641 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	9642 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	9643 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	9644 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	9645
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9646 /* 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	9647 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	9648 (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	9649 &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	9650
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9651 /* 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	9652 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	9653
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	9654 /* Record the request time */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9655 time(&extents_time);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9656
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	9657 /* 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	9658 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9659 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9660 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9661 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9662 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9663 while(currtime - 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	9664
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9665 /* 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	9666 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	9667 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9668
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	9669 /* 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	9670 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	9671 if(gdk_property_get(gdkwindow,
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9672 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	9673 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	9674 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	9675 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	9676 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9677 *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	9678 *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	9679 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9680 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9681 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	9682 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	9683 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9684
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9685 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9686 * 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	9687 * 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	9688 * 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	9689 * 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	9690 * 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	9691 */
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 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	9693 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9694 int _locked_by_me = 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	9695
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 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	9697 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	9698
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 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	9700 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	9701 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9702 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	9703 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	9704
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9705 /* 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	9706 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	9707 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9708 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9709 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	9710
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9711 /* 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	9712 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	9713 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	9714
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9715 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	9716 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	9717 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9718 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	9719 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	9720 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9721 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9722 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9723 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9724 /* 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	9725 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	9726 (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	9727 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9728 /* 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	9729 * 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	9730 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9731 _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	9732 /* 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	9733 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	9734 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	9735 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9736 /* 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	9737 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	9738 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	9739 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9740 /* 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	9741 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	9742 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9743 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	9744 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	9745 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9746 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9747 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	9748 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	9749 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	9750 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9751
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9752 /*
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	9753 * 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	9754 * 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	9755 * 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	9756 * 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	9757 * 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	9758 */
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	9759 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	9760 {
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	9761 int _locked_by_me = FALSE;
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	9762
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	9763 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	9764 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	9765 {
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	9766 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	9767
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	9768 _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	9769
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	9770 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	9771 *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	9772 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	9773 *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	9774 }
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	9775 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	9776 {
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	9777 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	9778 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	9779 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	9780 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	9781 }
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	9782 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	9783 }
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	9784
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9785 /* 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	9786 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9787 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9788 #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	9789 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9790 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	9791
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9792 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9793 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9794 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	9795
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9796 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9797 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9798 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9799 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9800 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9801 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9802 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9803 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9804 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	9805 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9806 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	9807 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9808 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9809
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	9810 /*
775 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 * 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	9812 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9813 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	9814 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9815 int retval = 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9816 int _locked_by_me = FALSE;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9817
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9818 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9819 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	9820 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	9821 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	9822 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9823
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9824 /* 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	9825 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9826 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9827 #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	9828 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9829 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	9830
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9831 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9832 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9833 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	9834
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9835 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9836 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9837 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9838 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9839 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9840 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9841 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9842 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9843 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	9844 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9845 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	9846 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9847 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9848
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9849 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9850 * 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	9851 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9852 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	9853 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9854 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	9855 int _locked_by_me = 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	9856
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9857 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9858 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	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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9863 /* 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	9864 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	9865 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9866 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	9867 GdkVisual *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	9868 int _locked_by_me = 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	9869
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9870 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9871 #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	9872 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	9873 #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	9874 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	9875 #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	9876 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	9877 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	9878 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	9879 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9880
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9881 /*
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9882 * 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	9883 * 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	9884 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9885 * 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	9886 * 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	9887 * 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	9888 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9889 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	9890 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9891 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	9892 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	9893 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9894
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9895 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9896 * 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	9897 * 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	9898 * 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	9899 * 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	9900 * 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	9901 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9902 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	9903 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9904 int _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	9905 #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	9906 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9907 #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	9908
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9909 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9910 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	9911
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9912 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	9913 #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	9914 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	9915 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9916 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	9917 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9918 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9919 #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	9920 {
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9921 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	9922
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9923 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	9924 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9925 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	9926 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	9927 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	9928 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	9929 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	9930 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	9931
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9932 /* 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	9933 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	9934 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9935 /* 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	9936 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	9937 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9938 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	9939 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	9940
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9941 /* 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	9942 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	9943
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	9944 /* 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	9945 * 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	9946 * 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	9947 */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9948 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	9949 (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	9950 {
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	9951 _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	9952 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	9953 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	9954 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9955 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	9956 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	9957 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9958 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9959 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9960 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9961 /* 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	9962 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	9963 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9964 /* 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	9965 * 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	9966 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9967 _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	9968 /* 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	9969 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	9970 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	9971 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9972 /* 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	9973 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	9974 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	9975 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	9976 /* 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	9977 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	9978 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	9979 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	9980 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9981 /* 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	9982 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	9983 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9984 /* 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	9985 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9986 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9987 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9988 /* 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	9989 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	9990 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9991 /* 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	9992 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	9993 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	9994 /* 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	9995 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	9996 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	9997 /* 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	9998 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	9999 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	10000 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	10001 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	10002
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10003 #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	10004 /* 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	10005 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	10006 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10007 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10008 #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	10009 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	10010
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10011 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10012 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10013 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	10014
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10015 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10016 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	10017 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10018 #else
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10019 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	10020
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10021 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	10022 #endif
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10023 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	10024 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10025 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	10026 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10027 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	10028 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	10029 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10030 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	10031 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10032 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	10033 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10034 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	10035 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	10036 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	10037 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10038 #endif
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10039 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10040 /* 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	10041 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	10042 }
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	10043 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	10044 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	10045 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10046 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	10047 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10048
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10049 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10050 * 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	10051 * 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	10052 * 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	10053 * 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	10054 * 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	10055 * 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	10056 * 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	10057 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10058 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	10059 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10060 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	10061 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	10062 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10063
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10064 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 * 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	10066 * 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	10067 * 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	10068 * 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	10069 * 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	10070 * 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	10071 * 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	10072 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10073 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	10074 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10075 int _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	10076 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	10077 #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	10078 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10079 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10080
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10081 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10082 #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	10083 /* 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	10084 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	10085 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10086 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	10087 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10088 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	10089 #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	10090 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10091 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	10092
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10093 /* 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	10094 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	10095 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10096 /* 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	10097 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	10098 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10099 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	10100 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10101 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10102
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10103 /* 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	10104 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	10105 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	10106 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	10107 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	10108 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	10109 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10110 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10111 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	10112 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10113 /* 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	10114 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	10115 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	10116 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10117 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10118 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10119 /* 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	10120 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10121 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10122 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10123 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10124 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10125 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10126 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	10127 *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	10128 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	10129 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10130
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10131 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10132 * 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	10133 * 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	10134 * 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	10135 * 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	10136 * 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	10137 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10138 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	10139 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10140 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	10141 int _locked_by_me = 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	10142
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10143 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	10144 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	10145 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10146 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	10147 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	10148 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	10149 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10150 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	10151 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10152 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	10153 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	10154 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	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 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	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 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	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 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	10161 {
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 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	10163 }
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 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	10165 {
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 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	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 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10170 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	10171 {
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 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	10173 /* 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	10174 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	10175 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	10176 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	10177 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	10178 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	10179 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	10180 /* 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	10181 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	10182 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	10183 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	10184 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	10185 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	10186 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	10187 #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	10188 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	10189 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	10190 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	10191 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	10192 #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	10193 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	10194 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	10195 }
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	10196 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	10197 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10198 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	10199
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	10200 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	10201 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	10202
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10203 _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	10204 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	10205 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	10206 _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	10207 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10208 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	10209 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10210 _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	10211 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	10212 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	10213 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	10214 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	10215 _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	10216 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10217 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	10218 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10219
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 * 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	10222 * 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	10223 * 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	10224 * 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	10225 * 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	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 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	10228 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10229 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	10230 int _locked_by_me = 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	10231 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	10232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10233 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	10234 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	10235
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10236 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	10237 {
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 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	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 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	10241 {
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	10242 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	10243 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	10244
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 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	10246 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	10247
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	10248 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	10249 /* 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	10250 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	10251 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	10252 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	10253 }
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 }
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 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	10257
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 /* 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	10259 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	10260 }
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 /* Return the physical page id from the logical 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	10263 int _get_physical_page(HWND handle, unsigned long 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	10264 {
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 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	10266 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	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(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	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 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	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 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	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 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	10275 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	10276 }
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 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	10280 }
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 /*
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 * 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	10284 * 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	10285 * 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	10286 * 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	10287 */
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 void dw_notebook_page_destroy(HWND handle, unsigned int 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	10289 {
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 int realpage, _locked_by_me = 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	10291 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	10292
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 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	10294 realpage = _get_physical_page(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	10295 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	10296 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10297 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	10298 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	10299 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	10300 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10301 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	10302 }
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
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 /*
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 * 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	10306 * 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	10307 * 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	10308 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10309 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	10310 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10311 int retval, phys;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10312 int _locked_by_me = 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	10313
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10314 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	10315 phys = gtk_notebook_get_current_page(GTK_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	10316 retval = _get_logical_page(handle, phys);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10317 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	10318 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	10319 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10321 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10322 * 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	10323 * 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	10324 * 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	10325 * 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	10326 */
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 void dw_notebook_page_set(HWND handle, unsigned int 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	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 int realpage, _locked_by_me = 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	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 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	10332 realpage = _get_physical_page(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	10333 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	10334 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	10335 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10340 * 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	10341 * 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	10342 * 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	10343 * 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	10344 * 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	10345 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10346 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	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 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	10349 int realpage, _locked_by_me = 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	10350
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 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	10352 realpage = _get_physical_page(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	10353 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	10354 {
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	10355 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	10356 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	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(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	10359 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	10360 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	10361 }
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
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 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	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 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	10366 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	10367 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	10368 }
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 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	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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10373 * 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	10374 * 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	10375 * 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	10376 * 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	10377 * 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	10378 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10379 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	10380 {
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 /* 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	10382 }
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 /*
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 * 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	10386 * 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	10387 * 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	10388 * 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	10389 * 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	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 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	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 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	10394 const gchar *text = 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	10395 int num, z, realpage = -1, pad, _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	10396 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	10397
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	10398 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	10399 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	10400 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	10401 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	10402 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	10403
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 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	10405 {
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 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	10407 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	10408 }
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
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 /* 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	10411 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	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 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	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 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	10416 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	10417 {
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 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	10419 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	10420 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	10421 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	10422 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	10423 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	10424 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10426 }
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
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 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	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 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	10431
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10432 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	10433 {
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	10434 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	10435 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	10436 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10437
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 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	10439 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	10440 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	10441 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	10442 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	10443 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	10444 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	10445 }
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 * 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	10449 * 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	10450 * 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	10451 * 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	10452 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10453 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	10454 {
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	10455 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	10456 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10459 * 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	10460 * 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	10461 * 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	10462 * 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	10463 * 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	10464 * 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	10465 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10466 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	10467 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468 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	10469 GtkListStore *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	10470 int _locked_by_me = FALSE;
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	10471
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	10472 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	10473 /* 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	10474 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	10475 {
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	10476 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	10477 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	10478 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	10479 }
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	10480 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	10481 {
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	10482 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10483
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	10484 /* 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	10485 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	10486 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	10487 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	10488 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	10489
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	10490 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	10491 {
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	10492 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	10493 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	10494 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10495
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	10496 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	10497 {
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	10498 /* 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	10499 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	10500 }
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	10501 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	10502 {
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	10503 /* 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	10504 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	10505 }
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	10506 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	10507 }
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	10508 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	10509 }
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	10510
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	10511 /*
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	10512 * 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	10513 * 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	10514 * 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	10515 * 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	10516 * 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	10517 */
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	10518 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	10519 {
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	10520 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	10521 GtkListStore *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	10522 int _locked_by_me = FALSE;
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	10523
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	10524 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	10525 /* 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	10526 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	10527 {
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	10528 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	10529 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	10530 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	10531 }
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	10532 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	10533 {
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	10534 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	10535 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10536
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	10537 /* 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	10538 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	10539 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	10540 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	10541 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	10542
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	10543 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	10544 {
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	10545 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	10546 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	10547 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10548
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	10549 /* 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	10550 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	10551 {
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	10552 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	10553 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	10554 }
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	10555 }
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	10556 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	10557 }
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	10558
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	10559 /*
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	10560 * 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	10561 * 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	10562 * 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	10563 */
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	10564 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	10565 {
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	10566 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	10567 GtkListStore *store = NULL;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10568 int _locked_by_me = FALSE;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10569
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10570 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	10571 /* 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	10572 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	10573 {
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 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	10575 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	10576 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	10577 }
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	10578 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	10579 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10580 /* 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	10581 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	10582 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	10583 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	10584 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	10585
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	10586 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	10587 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10588 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	10589 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	10590 }
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	10591 /* Clear the list */
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10592 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	10593 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10594 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	10595 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10596
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10597 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10598 * 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	10599 * 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	10600 * 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	10601 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10602 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	10603 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10604 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	10605 GtkListStore *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	10606 int _locked_by_me = FALSE;
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 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	10608
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 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	10610 /* 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	10611 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	10612 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 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	10614 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	10615 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	10616 }
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	10617 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	10618 {
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 /* 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	10620 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	10621 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	10622 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	10623 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	10624
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	10625 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	10626 {
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 /* 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	10628 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	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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10631 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	10632 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	10633 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10634
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10635 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10636 * 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	10637 * 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	10638 * 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	10639 * 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	10640 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10641 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	10642 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10643 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	10644 int _locked_by_me = 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	10645
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10646 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	10647 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	10648 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10649 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	10650 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	10651 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	10652 }
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10653 /* 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	10654 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	10655 {
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10656 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	10657 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	10658
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10659 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10660 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10661 /* 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	10662 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	10663 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	10664 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	10665 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	10666 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	10667
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10668 /* Safety check */
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10669 if(rowcount < 2)
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10670 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10671 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10672 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10673 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10674
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10675 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10676 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10677 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10678 top = rowcount;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10679
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10680 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	10681
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10682 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	10683 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10684 }
775 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 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	10686 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10688 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10689 * 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	10690 * 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	10691 * 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	10692 * 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	10693 * 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	10694 * 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	10695 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10696 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	10697 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 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	10699 GtkListStore *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	10700 int _locked_by_me = FALSE;
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
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	10702 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	10703 /* 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	10704 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	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 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	10707 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	10708 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	10709 }
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	10710 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	10711 {
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	10712 /* 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	10713 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	10714 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	10715 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	10716 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	10717
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10718 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	10719 {
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	10720 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10721
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10722 /* 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	10723 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	10724 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10725 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10726 gchar *text;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10727 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	10728 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10729 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10730 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	10731 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10732 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10733 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10734 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10735 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10736 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10737 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10738 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	10739 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	10740 }
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
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 /*
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 * 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	10744 * 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	10745 * 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	10746 * 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	10747 * 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	10748 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10749 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	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 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	10752 GtkListStore *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	10753 int _locked_by_me = FALSE;
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	10754
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	10755 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	10756 /* 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	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 }
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	10763 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	10764 {
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	10765 /* 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	10766 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	10767 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	10768 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	10769 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	10770
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10771 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	10772 {
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	10773 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10774
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10775 /* 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	10776 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	10777 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10778 /* Update the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10779 gtk_list_store_set(store, &iter, buffer);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10780 }
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	10781 }
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	10782 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10783 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	10784 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10785
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10786 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 * 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	10788 * 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	10789 * 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	10790 * 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	10791 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10792 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	10793 {
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	10794 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	10795 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	10796 int retval = DW_LIT_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	10797 int _locked_by_me = 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	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 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	10800 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	10801
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	10802 /* 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	10803 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	10804 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	10805
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	10806 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	10807 {
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	10808 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	10809 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	10810
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	10811 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	10812 {
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	10813 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	10814 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	10815
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	10816 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	10817 {
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	10818 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	10819
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	10820 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	10821 {
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	10822 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	10823 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	10824 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10825
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	10826 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	10827 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	10828 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10829
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	10830 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	10831 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	10832 }
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	10833 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10834 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	10835 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	10836 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10837
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10838 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10839 * 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	10840 * 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	10841 * 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	10842 */
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	10843 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	10844 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10845 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	10846 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10847 int _locked_by_me = FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10848 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	10849
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10850 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10851 /* 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	10852 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	10853 {
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 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	10855 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	10856 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	10857 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10858 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10859 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10860 /* 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	10861 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	10862 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	10863 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	10864 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	10865
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10866 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10867 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10868 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	10869 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10870 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	10871 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	10872 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	10873 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10874 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	10875 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	10876
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10877 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	10878 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10879 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	10880 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10881
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10882 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	10883 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	10884 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10885 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10886 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10887 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10888 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	10889 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10890
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	10891 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	10892 {
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	10893 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	10894 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	10895 {
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	10896 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	10897
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	10898 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	10899 {
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	10900 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	10901 }
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	10902 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	10903 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10904 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10905 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10906 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10907 }
775 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 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	10909 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	10910 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10911
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10913 * 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	10914 * 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	10915 * 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	10916 * 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	10917 * 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	10918 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10919 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	10920 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10921 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	10922 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10923 int _locked_by_me = FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10924
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10925 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10926 /* 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	10927 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	10928 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10929 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	10930 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	10931 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	10932 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10933 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10934 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10935 /* 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	10936 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	10937 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	10938 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	10939 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	10940
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10941 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	10942 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10943 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10944
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10945 /* 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	10946 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	10947 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10948 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	10949 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10950 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	10951 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10952 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10953 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10954 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	10955 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10956 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10957 /* 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	10958 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	10959 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10960 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10961 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10962 /* 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	10963 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	10964 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10965 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10966 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10967 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10968 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10969 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	10970 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10971
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10972 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10973 * 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	10974 * 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	10975 * 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	10976 * 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	10977 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10978 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	10979 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10980 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	10981 GtkListStore *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	10982 int _locked_by_me = FALSE;
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	10983
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	10984 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	10985 /* 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	10986 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	10987 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10988 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	10989 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	10990 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	10991 }
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	10992 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	10993 {
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	10994 /* 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	10995 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	10996 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	10997 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	10998 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	10999
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	11000 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	11001 {
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	11002 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11003
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11004 /* 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	11005 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	11006 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11007 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	11008 }
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	11009 }
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	11010 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11011 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	11012 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11013
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	11014 /* Function to do delayed positioning */
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11015 gboolean _splitbar_set_percent(gpointer 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	11016 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11017 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	11018 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	11019
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11020 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	11021 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11022 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	11023
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	11024 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	11025
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11026 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	11027 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	11028 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	11029 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	11030 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	11031 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	11032 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11033 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	11034 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	11035
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11036 /* Reposition the bar according to the percentage */
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 static gint _splitbar_size_allocate(GtkWidget widget, GtkAllocation event, 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	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 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	11040
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 /* 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	11042 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	11043 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	11044
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	11045 g_idle_add(_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	11046 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	11047 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11048
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11049 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11050 * 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	11051 * 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	11052 * 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	11053 * 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	11054 * 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	11055 * 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	11056 * 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	11057 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11058 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	11059 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11060 GtkWidget *tmp = 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	11061 int _locked_by_me = 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	11062 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	11063
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11064 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	11065 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	11066 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	11067 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	11068 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	11069 *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	11070 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)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	11071 g_signal_connect(G_OBJECT(tmp), "size-allocate", G_CALLBACK(_splitbar_size_allocate), 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	11072 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	11073 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	11074 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	11075 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11076
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11077 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11078 * 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	11079 * 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	11080 * 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	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 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	11083 {
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 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	11085 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	11086
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11087 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	11088 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	11089 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	11090 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	11091
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11092 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	11093 *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	11094
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11095 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	11096 {
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 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	11098
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 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	11100 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11103 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11104 * 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	11105 * 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	11106 * 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	11107 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11108 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	11109 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11110 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	11111
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11112 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	11113 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	11114 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	11115 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11116
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11117 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11118 * 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	11119 * 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	11120 * 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	11121 * 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	11122 * 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	11123 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11124 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	11125 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11126 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	11127 int _locked_by_me = 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	11128 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	11129 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	11130 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	11131
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11132 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	11133 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	11134 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	11135 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	11136 /* 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	11137 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	11138 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	11139 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	11140 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	11141 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	11142 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	11143
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11144 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	11145 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	11146 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11147
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 * 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	11150 * 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	11151 * 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	11152 * 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	11153 */
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 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	11155 {
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 int _locked_by_me = 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 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	11159 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	11160 {
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 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	11162 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	11163 }
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 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	11165 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	11166 }
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 /*
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 * 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	11170 * 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	11171 * 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	11172 */
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 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	11174 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11175 int _locked_by_me = 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	11176
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 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	11178 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	11179 {
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 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	11181 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	11182 }
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;
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 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11188 * 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	11189 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11190 * 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	11191 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11192 * 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	11193 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11194 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	11195 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11196 int _locked_by_me = FALSE;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11197
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11198 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11199 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11200
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11201 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	11202 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	11203 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	11204 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11205
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11206 /*
775 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 * 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	11208 * 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	11209 * 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	11210 * 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	11211 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11212 * 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	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 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	11215 {
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 int _locked_by_me = 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	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 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	11219 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	11220
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 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	11222 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	11223 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	11224 }
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 * 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	11228 * 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 * 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	11230 * 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	11231 */
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 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	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 int _locked_by_me = 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	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 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	11237 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	11238
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 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	11240 g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(_default_key_press_event), 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	11241 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	11242 }
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
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11244
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11245 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11246 * 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	11247 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11248 * 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	11249 * 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	11250 * 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	11251 * 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	11252 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11253 * 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	11254 * 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	11255 * Remarks:
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11256 * 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	11257 * 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	11258 */
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	11259 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	11260 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11261 #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	11262 GNotification *notification = g_notification_new(title);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11263
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11264 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11265 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11266 if(description)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11267 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11268 va_list args;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11269 char outbuf[1025] = {0};
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11270
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11271 va_start(args, description);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11272 vsnprintf(outbuf, 1024, description, args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11273 va_end(args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11274
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11275 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	11276 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11277 #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	11278 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	11279 {
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	11280 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	11281 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	11282
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	11283 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	11284 {
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11285 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	11286
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	11287 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	11288 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	11289 }
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	11290 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11291 #endif
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	11292 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	11293 (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	11294 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11295 return (HWND)notification;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11296 #else
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11297 return NULL;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11298 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11299 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11300
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11301 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11302 * 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	11303 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11304 * 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	11305 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11306 * 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	11307 */
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11308 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	11309 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11310 #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	11311 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11312 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11313 char id[101] = {0};
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11314
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11315 /* 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	11316 * 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	11317 */
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	11318 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	11319 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	11320 return DW_ERROR_NONE;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11321 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11322 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11323 return DW_ERROR_UNKNOWN;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11324 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11325
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11326 /*
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 * 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	11328 * 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	11329 * 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	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 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	11332 {
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 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	11334 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	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 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	11337 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	11338 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	11339 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	11340
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11341 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	11342 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11343 #ifdef USE_WEBKIT
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11344 # ifdef USE_WEBKIT2
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11345 strncpy(env->htmlEngine, "WEBKIT2", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11346 # else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11347 strncpy(env->htmlEngine, "WEBKIT", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11348 # endif
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11349 #else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11350 strncpy(env->htmlEngine, "N/A", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11351 #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	11352 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	11353 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	11354 #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	11355 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	11356 #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	11357 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	11358 #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	11359
2063 f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11360 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	11361 {
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11362 *dot = '\0';
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11363 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	11364 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	11365 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	11366 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11367 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	11368 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11370 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11371 * 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	11372 * 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	11373 * 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	11374 * 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	11375 * 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	11376 * 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	11377 * 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	11378 * 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	11379 * 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	11380 *
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11381 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11382 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	11383 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11384 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	11385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11386 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	11387 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	11388 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	11389 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	11390 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	11391 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	11392 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	11393
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11394 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	11395 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11396 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	11397 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	11398 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	11399 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	11400 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	11401 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	11402 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	11403 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	11404 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	11405 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	11406 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	11407 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	11408 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	11409 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	11410 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	11411 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	11412 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11413
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11414 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	11415 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	11416 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	11417 _("_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	11418 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	11419 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	11420
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11421 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	11422 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	11423
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424 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	11425 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11426 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	11427 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	11428 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	11429 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	11430 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	11431 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	11432 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	11433 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	11434 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	11435 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	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
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 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	11439 {
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11440 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	11441
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	11442 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	11443 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11444 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	11445 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11446
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11447 /* See if the path exists */
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11448 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11449 {
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11450 /* 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	11451 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11452 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	11453 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	11454 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	11455 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11456 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	11457 }
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11458 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11459 {
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	11460 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	11461 {
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	11462 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	11463
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	11464 /* 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	11465 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	11466 {
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	11467 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	11468 }
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	11469 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	11470 {
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	11471 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	11472 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	11473
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	11474 /* 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	11475 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	11476 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	11477
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	11478 /* 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	11479 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	11480 {
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	11481 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	11482 {
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	11483 /* 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	11484 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	11485 }
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	11486 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11487
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	11488 /* 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	11489 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	11490 /* ... 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	11491 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	11492 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	11493 }
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	11494 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11495 }
775 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 }
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
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 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	11499 {
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 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	11501 /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	11502 }
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 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	11505 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	11506 }
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
2348 e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11508 #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	11509 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	11510 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11511 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	11512 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11513 #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	11514
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11516 * 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	11517 * 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	11518 * 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	11519 * 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	11520 * 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	11521 * 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	11522 * 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	11523 */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11524 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	11525 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11526 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	11527 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	11528 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	11529
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11530 /* 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	11531 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	11532 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11533 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	11534
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11535 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	11536 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11537 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	11538 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11539 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11540 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	11541 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	11542 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	11543 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	11544 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11545 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	11546 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	11547 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11548 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11549 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11550 else
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11551 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	11552
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11553 /* 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	11554 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	11555 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	11556 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11557 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	11558
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11559 #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	11560 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	11561 #endif
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11562
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	11563 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	11564 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	11565
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11566 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	11567 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	11568 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2344 diff changeset	11569 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	11570 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	11571 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11573 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11574 * 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	11575 * 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	11576 * 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	11577 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11578 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	11579 {
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11580 /* 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	11581 #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	11582 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	11583 #else
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11584 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	11585 #endif
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11586 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11587 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	11588 }
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11589 else
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11590 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11591 /* 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	11592 * 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	11593 */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11594 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	11595
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11596 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	11597 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	11598 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	11599 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	11600 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11601
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11602 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	11603 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11604 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11605
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11606 #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	11607 /* 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	11608 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	11609 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11610 if(widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11611 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11612 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	11613 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	11614 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11615 #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	11616 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	11617 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	11618 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11619 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11620 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11621 return NULL;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11622 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 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 * 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	11626 * 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	11627 * 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	11628 * 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	11629 */
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 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	11631 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11632 #ifdef USE_WEBKIT
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11633 int _locked_by_me = 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	11634 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	11635
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11636 DW_MUTEX_LOCK;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11637
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11638 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	11639 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11640 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	11641 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11642 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	11643 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	11644 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	11645 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	11646 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	11647 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	11648 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	11649 #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	11650 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	11651 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11652 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	11653 #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	11654 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	11655 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	11656 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	11657 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	11658 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	11659 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	11660 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	11661 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	11662 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11663 #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	11664 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	11665 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	11666 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	11667 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11668 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	11669 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	11670 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11671 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11672 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	11673 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11674 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11675 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	11676 #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	11677 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11678
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11679 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11680 * 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	11681 * 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	11682 * 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	11683 * 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	11684 * 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	11685 * 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	11686 * 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	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_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	11689 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11690 #ifdef USE_WEBKIT
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11691 int _locked_by_me = 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	11692 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	11693
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11694 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	11695 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	11696 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11697 #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	11698 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	11699 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11700 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	11701 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11702 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	11703 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11704 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	11705 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	11706 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11707 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	11708 #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	11709 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11710
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11711 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11712 * 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	11713 * 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	11714 * 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	11715 * 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	11716 * 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	11717 * 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	11718 * 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	11719 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11720 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	11721 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11722 #ifdef USE_WEBKIT
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11723 int _locked_by_me = 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	11724 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	11725
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11726 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	11727 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	11728 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11729 #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	11730 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	11731 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11732 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	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 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	11735 }
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 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	11737 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	11738 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11739 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	11740 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11741 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11742
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11743 /*
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11744 * 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	11745 * Parameters:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11746 * 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	11747 * 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	11748 * 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	11749 * 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	11750 * Returns:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11751 * 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	11752 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11753 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	11754 {
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11755 #ifdef USE_WEBKIT
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11756 int _locked_by_me = FALSE;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11757 WebKitWebView *web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11758
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11759 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	11760 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	11761 #ifdef USE_WEBKIT2
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11762 webkit_web_view_run_javascript(web_view, script, NULL, _html_result_event, scriptdata);
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11763 #else
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11764 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	11765 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11766 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	11767 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	11768 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11769 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	11770 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11771 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11772
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11773 #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	11774 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	11775 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11776 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	11777 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	11778
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11779 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	11780 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	11781 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11782
775 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 * 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	11785 * 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	11786 * 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	11787 */
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11788 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	11789 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11790 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	11791
775 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 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	11793 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	11794 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	11795 }
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 #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	11797
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11798 /*
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11799 * 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	11800 * 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	11801 * 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	11802 */
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 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	11804 {
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	11805 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	11806 #ifdef USE_WEBKIT
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11807 int _locked_by_me = FALSE;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11808 WebKitWebView *web_view;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11809 #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	11810 WebKitSettings *settings;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11811 #else
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11812 WebKitWebSettings *settings;
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11813 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11814
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11815 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	11816 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	11817 /* 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	11818 * 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	11819 */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11820 #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	11821 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	11822 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	11823 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	11824 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	11825 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	11826 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	11827 /* 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	11828 settings = webkit_web_settings_new();
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11829 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	11830 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	11831 #else
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11832 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	11833 /* 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	11834 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	11835 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	11836 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	11837 #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	11838 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	11839 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	11840 #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	11841 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	11842 #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	11843 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	11844 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11847 * 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	11848 * 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	11849 * 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	11850 * 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	11851 * 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	11852 * 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	11853 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11854 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	11855 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11856 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11857 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11858 char *ret = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11859
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11860 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11861 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	11862 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11863 gchar *clipboard_contents;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11864
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11865 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	11866 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11867 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11868 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11869 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11870 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11871 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11872 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	11873 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11874
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11875 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11876 * 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	11877 * 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	11878 * 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	11879 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11880 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	11881 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11882 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11883 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11884
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11885 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11886 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	11887 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11888 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	11889 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11890 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	11891 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11892
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11893 /* 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	11894 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	11895 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11896 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	11897 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	11898 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	11899 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11900 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11901
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11902 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	11903 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11904 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	11905 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11906 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	11907 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	11908 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	11909 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11910 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	11911 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11912 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11913 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11914
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11915 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11916 * 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	11917 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11918 * 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	11919 * 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	11920 * 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	11921 * 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	11922 * 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	11923 * Returns:
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1136 diff changeset	11924 * 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	11925 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11926 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	11927 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11928 GtkPrintOperation *op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11929 int _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	11930
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11931 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11932 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11933
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11934 DW_MUTEX_LOCK;
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11935 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	11936 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11937 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	11938 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	11939 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	11940 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	11941 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	11942 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11943 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11944 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11945 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11946
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11947 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11948 * 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	11949 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11950 * 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	11951 * 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	11952 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11953 * 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	11954 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11955 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	11956 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11957 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11958 GtkPrintOperation op = (GtkPrintOperation )print;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11959 int _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	11960
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11961 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11962 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	11963 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11964 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	11965 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11966
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11967 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11968 * 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	11969 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11970 * 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	11971 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11972 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	11973 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11974 int _locked_by_me = FALSE;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11975 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	11976
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11977 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11978 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	11979 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11980 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11981
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11982 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11983 * 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	11984 * 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	11985 * 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	11986 */
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 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	11988 {
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 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	11990
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 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	11992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11993 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	11994
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11995 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	11996 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	11997 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	11998 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	11999 }
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12003 /*
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12004 * 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	12005 * 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	12006 */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12007 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	12008 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12009 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12010 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12011
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	12012 /*
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	12013 * 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	12014 * 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	12015 * 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	12016 * 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	12017 * 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	12018 * 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	12019 * 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	12020 * 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	12021 * 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	12022 * 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	12023 * 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	12024 * 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	12025 * 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	12026 * 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	12027 */
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	12028 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	12029 {
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	12030 #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	12031 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	12032 {
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	12033 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	12034 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	12035 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	12036 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	12037 }
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	12038 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	12039 #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	12040 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	12041 #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	12042 }
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	12043
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	12044 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12045 * 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	12046 * 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	12047 * 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	12048 * 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	12049 * 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	12050 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12051 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	12052 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12053 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	12054
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12055 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	12056
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12057 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	12058 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	12059 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12060
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12061 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12062 * 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	12063 * 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	12064 * 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	12065 * 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	12066 * 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	12067 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12068 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	12069 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12070 HWND thiswindow = 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	12071 int _locked_by_me = 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	12072
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12073 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	12074 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	12075
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12076 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	12077 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	12078 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12079 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	12080 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12081 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12082 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	12083 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	12084 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12085
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12086 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12087 * 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	12088 * 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	12089 * 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	12090 * 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	12091 * 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	12092 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12093 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	12094 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12095 HWND thiswindow = 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	12096 int _locked_by_me = 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	12097 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	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 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	12100 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	12101
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 DW_MUTEX_LOCK;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12103 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12104 {
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12105 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	12106 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12107 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	12108 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	12109 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	12110 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	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
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	12113 /* 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	12114 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	12115 {
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	12116 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	12117 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	12118 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	12119 int *tag = data;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12120
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	12121 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	12122 {
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	12123 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	12124 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	12125 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	12126 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	12127 }
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	12128 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	12129 {
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	12130 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	12131 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	12132 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	12133 }
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	12134 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	12135 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	12136 }
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	12137
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12138 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12139 * 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	12140 * 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	12141 * 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	12142 * 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	12143 * 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	12144 * 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	12145 * 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	12146 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12147 int API dw_timer_connect(int interval, void sigfunc, 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	12148 {
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	12149 int *tag, _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	12150 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	12151
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	12152 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	12153
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	12154 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	12155 *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	12156 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	12157 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	12158 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	12159 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	12160 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	12161 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	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
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 * 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	12166 * 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	12167 * 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	12168 */
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 void API dw_timer_disconnect(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	12170 {
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	12171 int _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	12172 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	12173
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	12174 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	12175 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	12176 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	12177 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	12178 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	12179 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	12180 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12181
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 /* 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	12183 * 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	12184 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12185 static HWND _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	12186 {
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 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	12188
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12189 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	12190 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	12191 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	12192 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	12193 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	12194 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	12195 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	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
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 /*
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 * 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	12200 * 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	12201 * 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	12202 * 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	12203 * 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	12204 * 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	12205 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12206 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	12207 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12208 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	12209 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12210
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12211 /* 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	12212 * 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	12213 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12214 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	12215 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12216 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12217 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12218 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12219 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	12220
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12221 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12222 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12223 SignalHandler work = _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	12224
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12225 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12226 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12227 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	12228 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12229 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12230 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12231 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12232 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12233
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12234 #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	12235
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12236 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12237 * 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	12238 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12239 * 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	12240 * 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	12241 * 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	12242 * 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	12243 * 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	12244 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12245 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	12246 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12247 void *thisfunc = _findsigfunc(signame);
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12248 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	12249 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	12250 int sigid, _locked_by_me = FALSE;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12251 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	12252 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	12253
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12254 /* 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	12255 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	12256
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12257 DW_MUTEX_LOCK;
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12258 #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	12259 /* 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	12260 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	12261 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12262 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	12263 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	12264 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	12265 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	12266 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	12267 DW_MUTEX_UNLOCK;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12268 return;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12269 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12270 #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	12271 /*
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 * 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	12273 * 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	12274 */
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12275 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	12276 #ifdef USE_WEBKIT
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12277 && !(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	12278 #endif
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12279 )
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12280 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12281 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	12282 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12283
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12284 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	12285 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12286 thisname = "draw";
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12287 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12288 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	12289 {
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 thisname = "activate";
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 thisfunc = _findsigfunc(thisname);
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 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	12294 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12295 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12296 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	12297 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12298 cid = g_signal_connect_data(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 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	12299 _set_signal_handler_id(thiswindow, sigid, 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	12300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12301 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	12302 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	12303 }
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	12304 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	12305 (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	12306 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12307 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12308
775 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 thisname = "changed";
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12310
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12311 sigid = _set_signal_handler(widget, window, sigfunc, data, thisfunc, discfunc);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12312 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	12313 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	12314 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	12315 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12316 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	12317 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	12318 }
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	12319 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	12320 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12321 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(_combobox_select_event), 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	12322 }
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	12323 _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	12324
775 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 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	12326 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	12327 }
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 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	12329 {
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 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	12331 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	12332 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	12333 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12334 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event, discfunc);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12335 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	12336 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12337 cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_container_enter_event), params, _dw_signal_disconnect, 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	12338 _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	12339
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12340 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	12341
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12342 thisname = "button_press_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	12343 thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12344 }
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12345 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	12346 {
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12347 /* 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	12348 * 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	12349 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12350 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _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	12351 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	12352 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12353 return;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12354 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12355 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	12356 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12357 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	12358 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	12359 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	12360 }
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12361 #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	12362 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	12363 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12364 #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	12365 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	12366 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12367 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12368 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	12369 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12370 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	12371 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-started", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12372 _set_signal_handler_id(thiswindow, sigid, cid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12373
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12374 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	12375
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12376 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12377 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	12378 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12379 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	12380 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-committed", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12381 _set_signal_handler_id(thiswindow, sigid, cid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12382
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12383 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	12384 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	12385
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12386 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	12387 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12388 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12389 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	12390 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12391 /* 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	12392 * 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	12393 */
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12394 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _html_result_event, discfunc);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12395 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	12396 #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	12397 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	12398 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12399 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	12400 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12401 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12402 #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	12403 #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	12404 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	12405 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12406 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	12407 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	12408 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	12409 }
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 #endif
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	12411 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	12412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12413 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	12414 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12415 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	12416 {
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 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	12418 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12419
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 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	12421 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12422 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	12423 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	12424 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	12425 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12426
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12427 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12428 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	12429 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12430 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 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	12431 _set_signal_handler_id(thiswindow, sigid, 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	12432 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	12433 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12434
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12435 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12436 * 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	12437 * 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	12438 * 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	12439 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12440 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	12441 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12442 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	12443 void *thisfunc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12444 int _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	12445 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	12446
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12447 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12448 params[2] = _find_signal_window(window, signame);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12449 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12450 thisfunc = _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	12451
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12452 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	12453 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12454 SignalHandler 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	12455
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12456 params[0] = GINT_TO_POINTER(z);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12457 sh = _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	12458
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 if(sh.intfunc == thisfunc)
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12460 _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	12461 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12462 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	12463 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12464
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12465 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12466 * 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	12467 * 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	12468 * 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	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 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	12471 {
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 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	12473 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	12474 int _locked_by_me = 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	12475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12476 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	12477 thiswindow = _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	12478 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	12479
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12480 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	12481 _remove_signal_handler(thiswindow, 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	12482 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	12483 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12487 * 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	12488 * 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	12489 * 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	12490 * 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	12491 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12492 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	12493 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12494 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	12495 int _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	12496 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	12497
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12498 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12499 params[2] = _find_signal_window(window, NULL);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12500 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	12501
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12502 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	12503 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12504 SignalHandler 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	12505
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12506 params[0] = GINT_TO_POINTER(z);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12507 sh = _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	12508
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12509 if(sh.data == data)
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12510 _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	12511 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12512 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	12513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12514
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12515 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12516 * 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	12517 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12518 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12519 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12520 * 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	12521 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12522 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12523 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	12524 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12525 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	12526
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12527 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12528 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	12529 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	12530 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	12531 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12532 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12533 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12534 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12535 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12536 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12537 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12538
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12539 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12540 * 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	12541 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12542 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12543 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12544 * 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	12545 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12546 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12547 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	12548 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12549 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	12550
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12551 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12552 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	12553 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	12554 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	12555 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12556 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12557 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12558 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12559 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12560 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	12561 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12562
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12563 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12564 * 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	12565 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12566 * 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	12567 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12568 * 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	12569 * 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	12570 * 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	12571 * 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	12572 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12573 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	12574 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12575 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12576 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12577 #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	12578 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	12579 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12580 #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	12581 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	12582 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12583 #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	12584 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	12585 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12586 #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	12587 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	12588 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12589 #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	12590 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	12591 #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	12592 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	12593 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	12594 case DW_FEATURE_MLE_WORD_WRAP:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12595 return DW_FEATURE_ENABLED;
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12596 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12597 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	12598 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12599 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12600
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12601 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12602 * 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	12603 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12604 * 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	12605 * 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	12606 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12607 * 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	12608 * 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	12609 * 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	12610 * Remarks:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12611 * 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	12612 * 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	12613 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12614 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	12615 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12616 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12617 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12618 /* 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	12619 #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	12620 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	12621 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12622 #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	12623 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	12624 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12625 #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	12626 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	12627 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12628 #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	12629 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	12630 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12631 #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	12632 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	12633 #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	12634 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	12635 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	12636 case DW_FEATURE_MLE_WORD_WRAP:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12637 return DW_ERROR_GENERAL;
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12638 /* 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	12639 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12640 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	12641 }
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12642 }

Mercurial > dwindows

annotate gtk3/dw.c @ 2349:123e22827a82