dwindows: gtk3/dw.c annotate

annotate gtk3/dw.c @ 2211:9395c1efa98b

GTK: _dw_app_id[] is not used with glib prior to 2.28 so move it into #ifdef

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 09 Dec 2020 04:35:40 +0000
parents	7677e1083d07
children	3e9c5bff0a57

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 *
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	6 * (C) 2000-2020 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
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	122 pthread_key_t _dw_fg_color_key;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	123 pthread_key_t _dw_bg_color_key;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	124 pthread_key_t _dw_mutex_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	125
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	126 GtkWidget last_window = NULL, popup = 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	127
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	128 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	129 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	130
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	131 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	132 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	133 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	134
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	135 #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	136 #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	137
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	138 #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	139 #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	140 #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	141
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	142 #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	143 #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	144 #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	145 #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	146
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	147 /* 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	148 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	149 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	150 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	151 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	152 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	153 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	154 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	155 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	156 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	157 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	158 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	159 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	160 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	161 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	162 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	163 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	164 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	165 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	166 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	167 #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	168 #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	169 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	170 #else
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, 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	172 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	173 #endif
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	174 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	175
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	176 GObject *_DWObject = NULL;
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	177 #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	178 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	179 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	180 #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	181 char *_DWDefaultFont = NULL;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	182 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	183
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	184 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	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 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	187 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	188
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 } 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	190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	191 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	192 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	193 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	194 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	195 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	196 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	197 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	198
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 } 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	200
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	201 #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	202
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	203 /* 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	204 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	205 { _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	206 { _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	207 { _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	208 { _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	209 { _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	210 { _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	211 { _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	212 { _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	213 { _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	214 { _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	215 { _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	216 { _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	217 { _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	218 { _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	219 { _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	220 { _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	221 { _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	222 { _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	223 #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	224 { _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	225 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	226 { _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	227 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	228 { _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	229 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	230
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 /* 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	232 #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	233 #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	234 #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	235 #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	236 #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	237
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	238 #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	239 /* MDI Support Code */
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	240 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	241 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	242 #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	243 #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	244 #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	245
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 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	247 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	248 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	249 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	250
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 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	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 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	254 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	255 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	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	257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	258 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	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 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	261 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	262
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 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	264 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	265 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	266
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	267 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	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 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	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 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	272 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	273
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	274 #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	275 #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	276 #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	277
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	278 #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	279 #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	280 #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	281 #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	282 #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	283 #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	284 #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	285
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 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	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 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	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 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	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 *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	293 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	294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	295 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	296 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	297 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	298 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	299
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 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	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
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 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	304 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	305
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_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	307 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	308 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	309 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	310 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	311
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	312 /* 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	313 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	314 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	315 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	316 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	317 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	318
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319 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	320 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	321 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	322
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 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	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 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	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 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	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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	332 static 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	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 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	335 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	336 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	337 (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	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 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	340 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	341 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	342 (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	343 };
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
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 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	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 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	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
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 /* 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	351 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	352
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 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	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 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	356 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	357
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 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	359 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	360
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 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	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 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	364 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	365 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	366 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	367 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	368
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 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	370 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	371 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	372 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	373 }
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
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 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	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 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	378 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	379 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	380
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	381 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	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 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	384 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	385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	386 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	387 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	388 _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	389
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	390 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	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
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 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	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 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	396
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	397 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	398 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	399
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	400 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	401 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	402 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	403 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	404 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	405
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	406 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	407 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	408 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	409 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	410
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 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	412 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	413 #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	414 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	415 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	416 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	417 #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	418 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	419 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	420 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	421 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	422 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	423
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	424 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	425 {
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 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	427 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	428 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	429
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	430 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	431
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	432 _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	433 _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	434 _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	435 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	436 {
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	437 _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	438 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	439 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	440 _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	441 #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	442 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	443 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	444 #else
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	445 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	446 #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	447
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	448 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	449 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	450 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	451
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
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 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	454 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	455 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465
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	466
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	467 /* 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	468 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	469 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	470 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	471 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	472 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	473
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	474 /* 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	475 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	476 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	477 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	478
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 /* 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	480 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	481
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_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	483
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	484 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	485 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	486 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	487 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	488 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	489 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	490 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	491 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	492 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	493
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 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	495 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	496
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 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	498 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	499 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	500 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	501 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	502 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	503 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	504 gtk_widget_show (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	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
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	507 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	508 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	509 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	510 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	511 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	512 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	513
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 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	515 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	516 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	517 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	518 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	519 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	520 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	521 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	522 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	523 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	524 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	525 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	526 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	527 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	528 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	529 }
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
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 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	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 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	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 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	536 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	537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	538 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	539 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	540
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 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	542 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	543 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	544 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	545 }
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
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 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	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 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	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 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	552 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	553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	554 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	555 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	556
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 *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	558 *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	559 }
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
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 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	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 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	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 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	566 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	567
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	568 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	569 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	570
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 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	572 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	573 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	574 }
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
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 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	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 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	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 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	581 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	582 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	583 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	584 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	585
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 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	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 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	589 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	590 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	591 GdkWindow *thiswindow;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	592 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	593
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	594 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	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 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	597 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	598
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 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	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_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	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609 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	610 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	611 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	612 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	613
775 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_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	615 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	616 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	617
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	618 gdk_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	619 }
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
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	621 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	622 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	623 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	624 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	625 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	626 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	627
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	628 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	629 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	630
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	631 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	632 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	633 {
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 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	635 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	636
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 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	638 {
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	639 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	640 }
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 }
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 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	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 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	647 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	648 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	649 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	650
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	651 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	652 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	653
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 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	655 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	656 {
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 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	658 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	659
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 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	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 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	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 }
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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	667 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	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 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	670 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	671 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	672 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	673 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	674
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 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	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 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	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 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	680 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	681 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	682 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	683 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	684 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	685
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	686
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 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	688 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	689 {
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 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	691 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	692
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	693 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	694 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	695 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	696 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	697 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	698 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	699 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	700 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	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 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	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 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	705 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	706 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	707 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	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 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	710 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	711 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	712 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	713 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	714 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	715 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	716 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	717 }
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 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	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 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	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 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	723 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	724 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	725 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	726 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	727 }
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 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	729 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	730 {
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 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	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 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	734 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	735 }
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_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	737 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	738 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	739 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	740 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	741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743 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	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 }
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
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	748 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	749 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	750 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	751 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	752 GtkMdi *mdi;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	753 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	754
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	755 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	756 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	757 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	758
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	759 mdi = GTK_MDI (widget);
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	760
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	761 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	762 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	763 GtkAllocation allocation;
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 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	766 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	767 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	768
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	769 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	770 {
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 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	772 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	773 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	774 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	775 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	776 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	777 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	778
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	779 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	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 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	782 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	783 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	784 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	785
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	786 static void gtk_mdi_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	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 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	789 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	790 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	791
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	792 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	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 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	795 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	796 {
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 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	798 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	799 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	800
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	801 children = 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	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
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 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	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 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	807 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	808 }
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 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	810 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	811 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	812
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	813 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	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 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	816 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	817 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	818
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	819 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	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 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	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 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	824 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	825 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	826 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	827 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	828
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 (*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	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 }
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 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	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 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	836 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	837
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	838 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	839 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	840
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 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	842 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	843
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	844
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 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	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 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	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 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	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 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	852 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	853 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	854 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	855 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	856 #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	857 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	858 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	859 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	860 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	861 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	862 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	863 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	864 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	865 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	866 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	867 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	868 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	869 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	870 #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	871 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	872
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 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	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_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	876 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	877 }
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 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	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 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	881 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	882 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	883
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 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	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 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	887
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	888 #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	889 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	890 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	891 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	892 #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	893 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	894
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 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	896 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	897
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 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	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 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	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 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	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 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	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 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	907 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	908
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	909 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	910
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911
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 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	913 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	914
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
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 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	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 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	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 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	921 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	922 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	923
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 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	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
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 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	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 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	930 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	931
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 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	933 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	934
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 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	936 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	937
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 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	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 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	941 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	942 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	943 #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	944 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	945 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	946 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	947 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	948 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	949 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	950 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	951 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	952 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	953 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	954 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	955 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	956 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	957 #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	958 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	959
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 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	961 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	962 {
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 GtkAllocation allocation;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	964
775 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 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	966 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	967 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	968 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	969 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	970 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	971 }
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
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 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	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 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	977 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	978 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	979
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	980 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	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 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	983 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	984
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	985 #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	986 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	987 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	988 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	989 #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	990 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	991
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 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	993 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	994 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	995
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 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	997 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	998
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	999 gtk_widget_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	1000 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	1001 }
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 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	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 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	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 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	1007 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	1008 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	1009
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 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	1011 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	1012
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1013 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	1014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1015 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	1016 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	1017 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	1018
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 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	1020 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	1021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1022 gtk_widget_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	1023 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	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	1025 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	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 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	1028 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	1029 }
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
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 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	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
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 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	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 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	1037 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	1038 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	1039 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1040 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	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 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	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 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	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 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	1047 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	1048 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	1049 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1050
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1051 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	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 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	1054 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	1055 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	1056 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 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	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 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	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 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	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 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	1064 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	1065 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	1066 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1067
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1068 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	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 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	1071 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	1072
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 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	1074 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	1075
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 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	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 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	1079 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	1080 }
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
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 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	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 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	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 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	1087 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	1088 {
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 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	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 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	1092 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	1093
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 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	1095 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	1096 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098 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	1099 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	1100 #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	1101
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1102 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	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 #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	1105 /* 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	1106 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	1107
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 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	1109 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	1110 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1111 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	1112 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	1113 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1114 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	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 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	1117 #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	1118 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	1119 #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	1120 }
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
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 /* 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	1123 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	1124 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1125 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	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 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	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 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	1130 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	1131 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1132 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	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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1135 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	1136 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1137 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	1138
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1139 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1140 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1141 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1142 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	1143 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	1144 char text[100];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1145
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1146 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	1147 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	1148 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	1149 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	1150 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	1151 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	1152 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	1153 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	1154 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	1155 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	1156 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1157 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	1158 }
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
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 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	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 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	1163 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	1164
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 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	1166 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	1167 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	1168 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	1169 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	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_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	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_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	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_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	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 }
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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1179 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	1180 {
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	1181 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	1182 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	1183
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 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	1185 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	1186 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	1187 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	1188 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	1189 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	1190 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	1191 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	1192 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	1193 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	1194
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 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	1196 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	1197
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 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	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
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 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	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 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	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 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	1206 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	1207 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1208
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1209 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	1210 {
2053 026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2051 diff changeset	1211 #if USE_WEBKIT2
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1212 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	1213 WebKitJavascriptResult *js_result;
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1214 #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	1215 JSCValue *value;
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1216 #else
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1217 JSValueRef value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1218 JSGlobalContextRef context;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1219 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1220 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	1221 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	1222 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	1223 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	1224
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2028 diff changeset	1225 _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	1226 if(handlerdata)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1227 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1228 SignalHandler work;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1229 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	1230
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1231 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	1232
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1233 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	1234 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1235 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	1236 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	1237 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1238 }
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 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	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(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	1243 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	1244 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	1245 _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	1246 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1247 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1248
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1249 #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	1250 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	1251 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	1252 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1253 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	1254 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	1255 #else
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1256 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	1257 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	1258 if (JSValueIsString(context, value))
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1259 {
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1260 JSStringRef js_str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1261 gchar *str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1262 gsize str_length;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1263
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1264 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	1265 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	1266 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	1267 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	1268 JSStringRelease(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1269 #endif
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1270
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1271 if(htmlresultfunc)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1272 {
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1273 #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	1274 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	1275 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	1276 else
2028 fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2027 diff changeset	1277 #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	1278 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	1279 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1280 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	1281 }
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1282 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	1283 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	1284 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	1285 _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	1286 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1287 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1288
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1289 #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	1290 #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	1291 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	1292 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1293 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	1294 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	1295 int status = 0;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1296
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1297 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	1298 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	1299 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	1300 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1301 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	1302 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	1303 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1304 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	1305 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	1306 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1307 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	1308 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	1309 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1310 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1311 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	1312 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1313 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	1314
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1315 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	1316 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1317 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1318 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1319 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	1320 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1321 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	1322 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	1323 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	1324 void **params = data;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	1325
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1326 if(params)
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	1327 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	1328
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1329 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	1330 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1331 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	1332
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1333 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	1334 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1335 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1336 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1337 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	1338
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1339 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	1340 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1341 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	1342 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	1343
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 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	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 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	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 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	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 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	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
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 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	1354 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1355 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	1356 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	1357
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 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	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 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	1361 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	1362
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1363 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	1364 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	1365 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	1366 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	1367
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 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	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 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	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
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 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	1374 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1375 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	1376 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	1377
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 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	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 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	1381 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	1382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1383 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	1384 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	1385 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	1386 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	1387
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 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	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 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	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
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 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	1394 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1395 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	1396 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	1397
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 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	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 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	1401 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	1402 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	1403
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1404 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	1405 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	1406 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	1407 {
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 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	1409 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	1410 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	1411 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1412
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1413 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	1414 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	1415 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	1416 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	1417 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	1418 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	1419
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 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	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 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	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
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 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	1426 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1427 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	1428 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	1429
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1430 if(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	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 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	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 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	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 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	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
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 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	1440 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1441 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	1442 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	1443
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 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	1445 {
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1446 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	1447 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	1448 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	1449
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1450 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	1451
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1452 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	1453 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	1454 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1455 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	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
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 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	1459 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1460 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	1461 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	1462
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 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	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 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	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 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	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 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	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
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 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	1473 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1474 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	1475 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	1476
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 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	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 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	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 retval = activatefunc(popup ? popup : 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	1482 popup = 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	1483 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1484 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	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
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 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	1488 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1489 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	1490 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	1491
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1492 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	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 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	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 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	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 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	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
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1501 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	1502 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1503 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	1504 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	1505
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 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	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 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	1509 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	1510
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1511 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	1512 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	1513 exp.height = gtk_widget_get_allocated_height(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	1514 retval = exposefunc(work.window, &exp, 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	1515 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1516 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	1517 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1518
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	1519 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	1520 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1521 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	1522 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	1523
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1524 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	1525 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	1526
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	1527 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	1528 {
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	1529 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	1530
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(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	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 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	1534 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1535
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1536 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	1537
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1538 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	1539 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1540 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	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(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	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 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	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(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1547 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1548 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	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 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	1551 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1552 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	1553 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1554 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1555
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1556 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	1557 }
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	1558 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1559 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	1560 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1561
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1562 #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	1563 #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	1564
775 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 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	1566 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1567 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	1568 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	1569
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 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	1571 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1572 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	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 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	1575 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	1576 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	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 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	1579 {
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 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	1581 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	1582 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	1583
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1584 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	1585 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	1586 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1587 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	1588 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1589 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	1590 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1591 else
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, -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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1595 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1596 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1597 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1598 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1599
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1600 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	1601 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1602 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1603 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1604
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1605 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	1606 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1607 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	1608 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1609 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	1610 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1611 else
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, -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 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1616 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1617 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1618 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1619 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1620
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1621 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	1622 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1623 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1626 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	1627 }
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 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	1630 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1631 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	1632 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	1633
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 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	1635 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1636 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	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(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	1639 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1640 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	1641 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	1642 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	1643 void *itemdata = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1644 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	1645
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1646 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	1647 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1648 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	1649 return TRUE;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1650 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1651
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1652 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	1653 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	1654 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1655 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	1656 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1657 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	1658 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	1659 }
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	1660 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	1661 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1662 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	1663 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	1664 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1665 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1666 {
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 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	1668
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	1669 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	1670 {
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 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	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(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	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 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	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 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	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 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	1680 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1681 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1682 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1683 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1684 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1685 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1686
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1687 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	1688 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1689 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1690 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1691
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1692 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	1693 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1694 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	1695 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1696 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	1697 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	1698 }
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	1699 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	1700 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1701 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	1702 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	1703 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1704 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1705 {
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 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	1707
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	1708 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	1709 {
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 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	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 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	1713 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1714 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1715 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1716 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1717 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1718 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1719 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1720 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	1721 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1722 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1723 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	1724 }
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 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	1727 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1728 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	1729 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	1730
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 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	1732 {
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 (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	1734 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	1735 }
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 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	1737 }
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
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1739 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	1740 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1741 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	1742 GdkEventKey keyevent = (GdkEventKey )event;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1743 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	1744 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	1745
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1746 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	1747 {
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1748 /* 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	1749 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	1750 (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	1751 {
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1752 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	1753 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	1754 void *data = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1755
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1756 /* 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	1757 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	1758 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1759 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	1760 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1761
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1762 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1763 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	1764 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1765 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1766 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	1767
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1768 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	1769 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1770 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1771 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1772
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1773 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	1774 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1775 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	1776 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1777 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	1778 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	1779 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1780 g_free(text);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1781 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1782 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1783 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1784 }
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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1788 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	1789 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1790
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1791 /* 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	1792 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	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 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	1795 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	1796 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	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 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	1799 {
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 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	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(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	1803 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	1804 }
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 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	1807 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1809
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 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	1811 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1812 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	1813 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	1814
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 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	1816 {
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 (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	1818 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	1819 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1820 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	1821 }
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
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1823 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	1824 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1825 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	1826 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	1827
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1828 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1829 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1830 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	1831 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	1832
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1833 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1834 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1835 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	1836
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1837 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	1838 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	1839
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1840 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1841 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1842 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	1843 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	1844 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	1845 }
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	1846 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1847 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1848 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	1849 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1850
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 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	1852 {
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 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	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 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	1856 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	1857
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 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	1859 }
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
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1861 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	1862 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1863 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	1864 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	1865 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	1866
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1867 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	1868 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	1869
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1870 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	1871 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	1872 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	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 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	1875 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	1876
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1877 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	1878 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1879
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1880 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	1881 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1882 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	1883
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1884 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	1885 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1886 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	1887
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	1888 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	1889 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	1890 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	1891 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	1892 }
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 }
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 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	1895 }
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 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	1898 {
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 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	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 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	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 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	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(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	1906 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	1907 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	1908 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	1909 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1910 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1911 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	1912 }
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
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1914 #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	1915 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	1916 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1917 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	1918 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	1919 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	1920 }
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1921 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1922
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1923 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	1924 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1925 #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	1926 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	1927 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	1928 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	1929 #else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1930 return NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1931 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1932 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	1933
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1934 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	1935 {
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1936 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	1937 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	1938
1289 5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1939 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1940 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1941 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1942
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1943 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	1944 icon_pixbuf = icon;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1945 else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1946 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	1947
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1948 #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	1949 if(!icon_pixbuf)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1950 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1951 char *data = NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1952 int z;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1953
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1954 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	1955 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1956 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	1957 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1958 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	1959 break;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1960 }
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
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1963 if(data)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1964 icon_pixbuf = _dw_pixbuf_from_data(data);
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 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1967 if(userwidth)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1968 *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	1969 if(userheight)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1970 *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	1971
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	1972 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	1973 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1974
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1975 #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	1976 /* 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	1977 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	1978 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1979 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	1980 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	1981 void *data;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1982
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	1983 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	1984 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	1985 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	1986 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	1987 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	1988 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	1989
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1990 if(func)
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	1991 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	1992 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1993 #endif
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	1994
2197 b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	1995 #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	1996 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	1997 {
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	1998 /* 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	1999 * 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	2000 * 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	2001 */
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2002 }
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2003 #endif
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2004
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2005 #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	2006 #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	2007 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	2008 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2009 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	2010 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	2011
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2012 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	2013 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2014 _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	2015 _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	2016 _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	2017 }
2205 a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2018 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	2019 }
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2020 #endif
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2021
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2022 /*
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2023 * 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	2024 * Parameters:
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2204 diff changeset	2025 * 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	2026 * 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	2027 */
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2028 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	2029 {
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2030 /* 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	2031 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	2032 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2033 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	2034 char *pos = strrchr(pathcopy, '/');
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2035 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	2036
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2037 /* If we have a / then...
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2038 * 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	2039 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2040 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2041 {
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2042 binname = pos + 1;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2043 *pos = 0;
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2044 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2045
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2046 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2047 {
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2048 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	2049
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2050 if(binpos)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2051 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	2052 else
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2053 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2054 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	2055 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	2056 #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	2057 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	2058 {
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	2059 /* 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	2060 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	2061 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2062 #endif
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2063 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2064 if(pathcopy)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2065 free(pathcopy);
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2066 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	2067 /* 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	2068 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	2069 _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	2070
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2071 #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	2072 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	2073 #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	2074
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2075 /* 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	2076 _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	2077 _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	2078 _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	2079
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();
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2081
2202 c677d728e143 GTK3: Switch to using GResource for compiled in image resources. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2201 diff changeset	2082 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	2083
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	2084 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	2085 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	2086 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	2087
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	2088 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2089
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	2090 /* 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	2091 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2092
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2093 #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	2094 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	2095 {
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	2096 /* 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	2097 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	2098 }
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	2099
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2100 /* 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	2101 * 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	2102 * 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	2103 */
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	2104 _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	2105 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	2106 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2107 #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	2108 /* 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	2109 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	2110
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	2111 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	2112 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	2113 #endif
2197 b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2160 diff changeset	2114 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	2115 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	2116 }
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	2117 #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	2118 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	2119 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2120
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2121 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2122 * 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	2123 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2124 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	2125 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2126 _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	2127 _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	2128 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	2129 _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	2130 _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	2131 }
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
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 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2134 * 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	2135 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2136 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	2137 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2138 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	2139 }
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 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2142 * 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	2143 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2144 * 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	2145 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2146 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	2147 {
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 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	2149 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	2150
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2151 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	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 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	2154 {
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 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	2156
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 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	2158
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 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	2160 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2161 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	2162
775 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 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	2164 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2165 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	2166 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2167 _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	2168 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	2169 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2170 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2171 _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	2172 }
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2173 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	2174 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	2175 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	2176 _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	2177 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	2178 {
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 _dw_thread = orig;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2180 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2181 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2182 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	2183 _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	2184 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2185 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2186 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	2187 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2188 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2189 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	2190 _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	2191 }
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 * 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	2195 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2196 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	2197 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2198 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	2199 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	2200 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	2201
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2202 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	2203 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2204 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	2205 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2206 _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	2207 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	2208 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2209 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2210 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2211 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2212 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	2213 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2214 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2215 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2216 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	2217 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2218 _dw_thread = orig;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2219 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2220 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2221 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	2222 _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	2223 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2224 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2225 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2226
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2227 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2228 * 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	2229 * Parameters:
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 * 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	2231 * 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	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 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	2234 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2235 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	2236 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2237
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 /*
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 * 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	2240 * Parameters:
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 * 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	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 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	2244 {
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 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	2246
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 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	2248 {
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 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	2250 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	2251 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	2252 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	2253 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	2254 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	2255 }
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 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	2257 }
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
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 /*
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 * 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	2261 * 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	2262 * Parameters:
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 * 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	2264 * 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	2265 */
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 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	2267 {
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->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	2269 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	2270 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	2271 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	2272 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	2273 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	2274 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	2275 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2276
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2277 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2278 * 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	2279 * 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	2280 * Parameters:
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 * 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	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 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	2284 {
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 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	2286 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	2287
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2288 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	2289 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	2290
775 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 /* _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	2292 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	2293 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2294 _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	2295 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	2296 _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	2297 }
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 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	2300 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2301 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	2302 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	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 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	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 = 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	2307 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	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
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 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	2311 {
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_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	2313 _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	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
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 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	2317 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	2318 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	2319 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	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
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 /*
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	2323 * 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	2324 * 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	2325 * 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	2326 * ...: 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	2327 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2328 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	2329 {
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 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	2331 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	2332
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	2333 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	2334 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	2335 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	2336
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	2337 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	2338 }
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
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 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2341 * 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	2342 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2343 * 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	2344 * 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	2345 * 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	2346 * ...: 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	2347 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2348 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	2349 {
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2350 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	2351 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	2352 GtkWidget *dialog;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2353 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	2354 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	2355 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	2356
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2357 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	2358 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	2359 va_end(args);
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	2360
775 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 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	2362 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	2363 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	2364 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	2365 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	2366 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	2367 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	2368 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	2369
2027 ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2370 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	2371 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	2372 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	2373 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	2374
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2375 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	2376 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	2377 #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	2378 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	2379 #endif
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	2380 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	2381 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	2382 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	2383 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	2384 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	2385 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	2386 DW_MUTEX_UNLOCK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2387 switch(response)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2388 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2389 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	2390 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	2391 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	2392 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	2393 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	2394 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	2395 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	2396 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	2397 default:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2398 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2399 /* 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	2400 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	2401 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	2402 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	2403 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	2404 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2010 diff changeset	2405 }
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_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	2407 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2408
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2409 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2410 * 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	2411 * Parameters:
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 * 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	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 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	2415 {
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 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	2417 #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	2418 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	2419 #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	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 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	2422 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	2423
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2424 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	2425 #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	2426 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	2427 {
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 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	2429 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2430 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2431 #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	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_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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2436 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	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
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 * 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	2441 * Parameters:
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 * 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	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 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	2445 {
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 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	2447
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 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	2449 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	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 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	2452 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	2453 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	2459 * Parameters:
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 * 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	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 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	2463 {
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 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	2465
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 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	2467 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	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 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	2470 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	2471 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	2477 * Parameters:
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 * 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	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 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	2481 {
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 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	2483 GtkWidget *defaultitem;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2484 #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	2485 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2486 #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	2487
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2488 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	2489 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2490
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2491 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	2492 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	2493 #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	2494 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	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 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	2497 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2498 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2499 #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	2500 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2501 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	2502 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	2503 {
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	2504 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	2505 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	2506
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2507 /* 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	2508 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	2509 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2510 /* 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	2511 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	2512 /* 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	2513 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	2514 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	2515 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2516
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2517 /* 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	2518 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	2519 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2520 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	2521 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	2522
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2523 /* 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	2524 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	2525 /* 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	2526 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	2527 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2528
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2529 gdk_window_raise(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2530 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	2531 gdk_window_show(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2532 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	2533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2534 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	2535 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	2536 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	2537 }
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 DW_MUTEX_UNLOCK;
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 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	2540 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2541
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 * 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	2544 * Parameters:
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 * 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	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 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	2548 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2549 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	2550 #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	2551 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	2552 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2553
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 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	2555 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	2556
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2557 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	2558 #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	2559 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	2560 {
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 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	2562 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2563 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2564 #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	2565 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	2566 DW_MUTEX_UNLOCK;
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 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	2568 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2569
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 /*
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 * 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	2572 * Parameters:
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 * 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	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 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	2576 {
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 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	2578 #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	2579 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	2580 #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	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 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	2583 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	2584
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2585 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	2586 #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	2587 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	2588 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2589 gtk_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	2590 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2591 #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	2592 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	2593 {
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	2594 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	2595 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	2596
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	2597 /* 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	2598 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	2599 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	2600
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2601 /* 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	2602 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	2603 {
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 /* 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	2605 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	2606 #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	2607 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	2608 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	2609
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2610 /* 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	2611 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	2612 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2613 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	2614 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2615 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	2616 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2617 gtk_grid_remove_row(GTK_GRID(box), z);
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2618 break;
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 }
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 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2623 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2624 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	2625 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2626 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	2627 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2628 gtk_grid_remove_column(GTK_GRID(box), z);
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2629 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2630 }
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 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2633 #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	2634
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2635 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	2636 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2637 /* 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	2638 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	2639 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	2640 }
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 }
2057 9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2642 /* 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	2643 * 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	2644 */
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2645 if(GTK_IS_WIDGET(handle2))
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2056 diff changeset	2646 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	2647 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2648 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2649 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	2650 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2651
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2652 /* 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	2653 * Parameters:
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 * 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	2655 */
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 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	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
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 /*
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 * 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	2662 * Parameters:
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 * 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	2664 * 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	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 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	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 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	2669
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 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	2671 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	2672 DW_MUTEX_UNLOCK;
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 }
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 /*
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2676 * 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	2677 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2678 * 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	2679 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2680 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	2681 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2682 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	2683
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2684 _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	2685
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2686 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	2687 free(oldfont);
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2688 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2689
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	2690 /* Convert DW style font to pango style */
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	2691 void _convert_font(char *font)
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	2692 {
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	2693 char *name = strchr(font, '.');
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	2694
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	2695 /* Detect Dynamic Windows style font name...
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	2696 * Format: ##.Fontname
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	2697 * and convert to a Pango name
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	2698 */
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	2699 if(name && isdigit(*font))
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	2700 {
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	2701 int size = atoi(font);
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	2702 *name = 0;
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	2703 name++;
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	2704 sprintf(font, "%s %d", name, size);
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	2705 }
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	2706 }
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	2707
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2708 /* 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	2709 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	2710 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2711 if(color)
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2712 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2713 GtkCssProvider *provider = gtk_css_provider_new();
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2714 gchar *scolor = gdk_rgba_to_string(color);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2715 gchar css = g_strdup_printf (" { %s: %s; }", element, scolor);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2716
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2717 g_free(scolor);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2718 gtk_css_provider_load_from_data(provider, css, -1, NULL);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2719 g_free(css);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2720 gtk_style_context_add_provider(gtk_widget_get_style_context(widget), GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2721 g_object_unref(provider);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2722 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2723 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2724
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2725 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	2726 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2727 GtkCssProvider *provider = gtk_css_provider_new();
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2728 gchar css = g_strdup_printf (" { font: %s; }", font);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2729
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2730 gtk_css_provider_load_from_data(provider, css, -1, NULL);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2731 g_free(css);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2732 gtk_style_context_add_provider(gtk_widget_get_style_context(widget), GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2733 g_object_unref(provider);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2734 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2735
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2736 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2737 * 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	2738 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2739 * 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	2740 * 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	2741 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2742 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	2743 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2744 GtkWidget *handle2 = handle;
1001 4ef0e878fe06 Added support for Dynamic Windows style font names for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 998 diff changeset	2745 char *font = strdup(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	2746 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	2747 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	2748
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2749 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	2750 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	2751 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2752 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	2753 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	2754 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	2755 }
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	2756 /* 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	2757 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	2758 {
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	2759 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	2760 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	2761 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	2762 }
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2763 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	2764 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2765 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	2766 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	2767 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	2768 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2769
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	2770 _convert_font(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	2771
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2772 /* 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	2773 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	2774 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	2775 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	2776 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	2777
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2778 _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	2779
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2780 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2781 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	2782 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2783
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	2784 /* 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	2785 * 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	2786 * 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	2787 * 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	2788 * 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	2789 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	2790 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	2791 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2792 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	2793 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	2794 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	2795 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	2796 char *retfont = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2797
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2798 /* 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	2799 * 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	2800 * 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	2801 */
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	2802 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	2803 {
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	2804 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	2805 *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	2806 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	2807 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	2808 }
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	2809
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	2810 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	2811 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	2812 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	2813 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2814 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	2815 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	2816 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2817
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	2818 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	2819
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2820 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	2821 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2822 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	2823 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	2824 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2825 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	2826 /* 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	2827 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	2828 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2829 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	2830
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2831 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	2832 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2833 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2834 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2835 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	2836 /* 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	2837 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	2838 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2839 /* 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	2840 * 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	2841 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2842 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	2843 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	2844 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2845 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2846 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	2847 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2848 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2849 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	2850 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2851 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2852 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2853
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2854 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2855 * 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	2856 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2857 * 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	2858 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2859 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	2860 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2861 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	2862 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	2863 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	2864 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	2865 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	2866 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	2867
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2868 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	2869 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	2870 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2871 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	2872 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	2873 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	2874 }
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	2875 /* 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	2876 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	2877 {
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	2878 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	2879 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	2880 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	2881 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2882
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883 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	2884 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	2885 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2886 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	2887 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	2888 {
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	2889 int len, x;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2890
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2891 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	2892 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	2893 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	2894 /* 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	2895 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	2896 {
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	2897 int size;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2898
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	2899 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	2900 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	2901 {
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	2902 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	2903 }
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	2904 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	2905 /* 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	2906 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	2907 {
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	2908 /* 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	2909 * 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	2910 */
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	2911 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	2912 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	2913 }
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	2914 }
775 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 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	2916 }
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 }
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 DW_MUTEX_UNLOCK;
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 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	2920 }
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
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 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	2923 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2924 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	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 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	2927 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	2928
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2929 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	2930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2931 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	2932 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	2933 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2934
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2935 /* 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	2936 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	2937 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2938 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	2939 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	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 _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	2942
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 *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	2944 *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	2945
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 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	2947 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	2948 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2949
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2950 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	2951 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2952 /* 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	2953 * 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	2954 */
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	2955 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	2956
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2957 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	2958 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2959 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	2960 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	2961 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	2962 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	2963 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2964 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	2965 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	2966
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2967 _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	2968
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2969 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	2970 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2971 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	2972 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	2973 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	2974 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	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 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	2977 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	2978
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	2979 _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	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 _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	2982
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 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	2984 }
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 * 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	2987 * Parameters:
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 * 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	2989 * 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	2990 * 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	2991 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2992 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	2993 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2994 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	2995 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	2996
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 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	2998
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 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	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 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	3002 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	3003 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	3004 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3005 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	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 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	3008 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	3009 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3010 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	3011 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	3012 }
775 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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3015 _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	3016
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3017 DW_MUTEX_UNLOCK;
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 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	3019 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3020
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3021 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3022 * 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	3023 * Parameters:
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 * 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	3025 * 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	3026 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3027 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	3028 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3029 /* 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	3030 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	3031 }
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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3033 #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	3034 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3035 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3036 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3037 #endif
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3038
775 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 * 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	3041 * Parameters:
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 * 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	3043 */
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 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	3045 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3046 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	3047
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 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3049 #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	3050 _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	3051 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3052 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3053 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3054 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3055 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3056 _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	3057 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	3058 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	3059 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	3060 FALSE,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3061 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	3062 NULL,
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3063 GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3064 #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	3065 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3066 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3067
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 * 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	3070 * Parameters:
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 * 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	3072 * 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	3073 */
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 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	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 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	3077 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	3078
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3079 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	3080 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	3081 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	3082 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	3083 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	3084 }
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 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	3086 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	3087 else
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	3088 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	3089 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	3090 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	3091 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	3092 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	3093 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3096 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3097 * 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	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_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	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 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3106 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3107 _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	3108 #else
2208 3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2205 diff changeset	3109 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	3110 _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	3111 #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	3112 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3113 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3114
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3115 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3116 * 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	3117 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3118 * 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	3119 * 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	3120 * 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	3121 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3122 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	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 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	3125 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	3126 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	3127
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 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	3129 #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	3130 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	3131 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3132 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	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 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	3135
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3136 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	3137 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	3138 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	3139 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	3140 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	3141
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 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	3143 }
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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3145 #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	3146 {
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3147 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	3148 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	3149
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	3150 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	3151
775 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 last_window = tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL);
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 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	3155 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	3156
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 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	3158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3159 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	3160 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	3161
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3162 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	3163 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	3164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3165 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	3166 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	3167
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	3168 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	3169 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	3170
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3171 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	3172 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	3173 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3174 {
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3175 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	3176 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	3177
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3178 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	3179 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	3180 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3181
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	3182 /* 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	3183 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	3184
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 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	3186 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	3187 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	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 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	3190 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	3191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3192 if(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	3193 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	3194
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	3195 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	3196 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	3197 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	3198 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	3199 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	3200 }
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 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	3202 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3203 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	3204 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3205
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3206 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3207 * 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	3208 * Parameters:
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 * 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	3210 * 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	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 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	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 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	3215 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	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 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	3218 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	3219 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	3220
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 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	3222 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	3223 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	3224 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	3225 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	3226 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3227 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	3228 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3229
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3230 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3231 * 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	3232 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3233 * 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	3234 * 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	3235 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3236 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	3237 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3238 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	3239 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	3240
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3241 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	3242 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	3243 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	3244
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3245 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	3246 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	3247
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 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	3249 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	3250 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	3251 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	3252 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	3253
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3254 #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	3255 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	3256 #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	3257 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	3258 #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	3259 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	3260 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	3261 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	3262
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 DW_MUTEX_UNLOCK;
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 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	3265 }
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 /*
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 * 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	3269 * Parameters:
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 * 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	3271 * 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	3272 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3273 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	3274 {
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 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	3276 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	3277
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 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	3279 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	3280
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_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	3282 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	3283 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	3284 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	3285 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	3286 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	3287 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	3288 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	3294 * Parameters:
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 * 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	3296 * 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	3297 */
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 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	3299 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3300 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	3301 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	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 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	3304 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	3305
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 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	3307 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	3308 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	3309 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	3310 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	3311 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	3312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3313 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	3314 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3315 DW_MUTEX_UNLOCK;
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3319 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3320 * 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	3321 * Parameters:
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 * 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	3323 * 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	3324 * 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	3325 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3326 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	3327 {
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	3328 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	3329 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	3330
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 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	3332 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	3333 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	3334 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	3335
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3336 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	3337 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	3338 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	3339 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	3340 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	3341 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	3342 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	3343 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	3344 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	3345 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	3346 DW_MUTEX_UNLOCK;
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 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	3348 }
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
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3350 #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	3351 /*
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 * 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	3353 * Parameters:
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 * 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	3355 */
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 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	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 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	3359 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	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 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	3363 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	3364 DW_MUTEX_UNLOCK;
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 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	3366 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3367 #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	3368
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3369 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3370 * 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	3371 * Parameters:
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 * 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	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 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	3375 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3376 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	3377 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	3378
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 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	3380 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	3381 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	3382 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	3383 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	3389 * Parameters:
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 * 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	3391 * 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	3392 */
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 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	3394 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3395 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	3396 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	3397
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 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	3399 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	3400 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	3401 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	3402 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	3403 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	3404 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	3405 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	3406 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	3407 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	3408 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	3414 * Parameters:
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 * 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	3416 * 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	3417 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3418 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	3419 {
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 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	3421 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	3422 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	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 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	3425 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	3426 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	3427 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	3428 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	3429 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	3430 DW_MUTEX_UNLOCK;
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 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	3432 }
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 /*
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 * 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	3436 * Parameters:
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 * 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	3438 * 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	3439 * 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	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 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	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 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	3444 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	3445 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3446 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	3447
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3448 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	3449 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	3450 (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	3451 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3452 /* 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	3453 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	3454 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3455 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	3456 /* 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	3457 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	3458 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	3459 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	3460 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	3461 /* 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	3462 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	3463 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	3464 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	3465 }
775 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 DW_MUTEX_UNLOCK;
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 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	3468 }
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
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 /*
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 * 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	3472 * Parameters:
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 * 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	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 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	3476 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3477 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	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 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	3480 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	3481
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3482 DW_MUTEX_LOCK;
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	3483 /* 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	3484 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	3485 (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	3486 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	3487 /* 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	3488 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	3489 *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	3490 DW_MUTEX_UNLOCK;
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 }
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 }
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
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3494 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	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 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	3497 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	3498
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 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	3500 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3501 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	3502 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3503 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	3504 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	3505 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3506 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	3507 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508 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	3509 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	3510 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	3511 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3512 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3513 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	3514 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	3515 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3516
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3517 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3518 * 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	3519 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3520 * 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	3521 * 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	3522 * 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	3523 * 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	3524 * 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	3525 * 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	3526 * 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	3527 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3528 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	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 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	3531 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	3532 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	3533 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	3534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3535 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	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 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	3538 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	3539 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3540
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3541 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	3542 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	3543
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3544 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	3545 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	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 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	3548 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	3549 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	3550 {
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	3551 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	3552
775 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 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	3554 {
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 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	3556 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	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 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	3559 #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	3560 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	3561 #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	3562 }
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	3563 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	3564 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	3565 }
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 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	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 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	3569 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	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 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	3572 #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	3573 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	3574 #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	3575 }
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	3576 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	3577 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	3578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3579 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3580
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 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	3582
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3583 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	3584 {
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	3585 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	3586
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	3587 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	3588 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	3589 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	3590 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	3591 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	3592 }
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
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 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	3595 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	3596 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	3597 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	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 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	3600 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	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 * 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	3603 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3604 if ( 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	3605 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3606 _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	3607 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	3608 _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	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
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 ( 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	3612 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	3613
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 DW_MUTEX_UNLOCK;
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 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	3616 }
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
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3618 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	3619 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3620 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	3621 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	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 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	3624 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	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 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	3627 {
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	3628 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	3629 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	3630
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	3631 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	3632
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3633 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	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 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	3636 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	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 }
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 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	3640 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3641
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3642 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3643 * 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	3644 * Parameters:
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 * 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	3646 * 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	3647 * 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	3648 * 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	3649 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3650 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	3651 {
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	3652 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	3653 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	3654 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	3655
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3656 if(!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	3657 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	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 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	3660 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	3661 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	3662
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 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	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 _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	3666 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	3667 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	3668 _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	3669 }
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 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3673 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3674 * 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	3675 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3676 * 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	3677 * 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	3678 * 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	3679 */
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 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	3681 {
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	3682 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	3683 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	3684 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	3685 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	3686
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 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	3688 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	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 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	3691 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	3692 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	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 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	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 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	3697 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	3698 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	3699 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	3700
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 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	3702 {
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 _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	3704 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	3705 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	3706 _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	3707 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3708 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3709 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	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 (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	3712 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3713 _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	3714 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	3715 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	3716 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	3717 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	3718 _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	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 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3722 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3723
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 /*
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3725 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3726 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3727 * 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	3728 * 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	3729 * Returns:
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3730 * 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	3731 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3732 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	3733 {
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	3734 char numbuf[25] = {0};
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3735 GtkWidget *tmphandle;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3736 int _locked_by_me = FALSE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3737 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3738
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3739 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3740 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3741
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3742 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	3743 snprintf(numbuf, 24, "%lu", id);
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3744 tmphandle = _find_submenu_id(menu, numbuf);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3745
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3746 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3747 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3748 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3749 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	3750 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3751 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3752 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3753 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3754 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3755
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3756 /*
775 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 * 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	3758 * Parameters:
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 * 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	3760 * 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	3761 * 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	3762 * 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	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 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	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 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	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 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	3769 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	3770
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 popup = 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	3772
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3773 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3774 #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	3775 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	3776 #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	3777 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	3778 #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	3779 *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	3780 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3781 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3782
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3784 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3785 * 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	3786 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3787 * 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	3788 * 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	3789 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 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	3791 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3792 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	3793 int gx, gy;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3794 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	3795 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3796 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3797 #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	3798 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3799 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3800 GdkDeviceManager *manager;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3801 #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	3802
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3803 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	3804 #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	3805 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3806 #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	3807 seat = gdk_display_get_default_seat(display);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3808 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3809 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3810 manager = gdk_display_get_device_manager(display);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3811 device = gdk_device_manager_get_client_pointer(manager);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3812 #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	3813 gdk_window_get_device_position(gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3814 device, &gx, &gy, &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	3815 #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	3816 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	3817 *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	3818 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	3819 *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	3820 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3822
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 * 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	3825 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3826 * 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	3827 * 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	3828 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3829 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	3830 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3831 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	3832 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3833 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3834 #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	3835 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3836 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3837 GdkDeviceManager *manager;
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3838 #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	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 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	3841 #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	3842 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3843 #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	3844 seat = gdk_display_get_default_seat(display);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3845 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3846 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3847 manager = gdk_display_get_device_manager(display);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3848 device = gdk_device_manager_get_client_pointer(manager);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3849 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3850 gdk_device_warp(device, gdk_screen_get_default(), 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	3851 #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	3852 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3854
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3855 #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	3856 #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	3857 #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	3858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3859 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	3860 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3861 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	3862
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3863 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	3864 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	3865 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	3866
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3867 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	3868 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	3869 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	3870 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872 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	3873 {
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 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	3875 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	3876 #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	3877 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	3878 #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	3879 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	3880 #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	3881 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	3882 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	3883 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3886 * 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	3887 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3888 * 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	3889 * 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	3890 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3891 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	3892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3893 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	3894 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	3895
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3896 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	3897 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	3898 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3899 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3900 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	3901 }
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	3902 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	3903 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	3904 DW_MUTEX_UNLOCK;
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 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	3906 }
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
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 /*
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 * 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	3910 * Parameters:
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 * 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	3912 * 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	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 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	3915 {
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 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	3917 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	3918 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	3919 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	3920 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	3921 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	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 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	3924 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	3925 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3926 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3927 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	3928 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3929 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	3930 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	3931 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	3932 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	3933 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	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 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	3936 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	3937 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	3938 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	3939 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	3940 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	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 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	3943 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	3944 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	3945
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 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	3947 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	3948 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	3949
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3950 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	3951 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	3952 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3953 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	3954 }
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
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
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 * 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	3959 * Parameters:
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 * 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	3961 * 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	3962 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3963 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	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 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	3966 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	3967
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 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	3969 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	3970
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 /* 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	3972 #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	3973 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	3974 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	3975 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3976 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	3977 #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	3978 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	3979 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	3980 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	3981 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	3982 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3983 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	3984 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3985
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 /*
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 * 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	3988 * Parameters:
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 * 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	3990 * 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	3991 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	3992 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	3993 {
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 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	3995 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	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 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	3998 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	3999 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	4000 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	4001 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	4002 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	4003 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	4004
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 /* 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	4006 #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	4007 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	4008 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	4009 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	4010 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	4011 #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	4012 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	4013 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	4014 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	4015 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	4016 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	4022 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4023 * 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	4024 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4025 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	4026 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	4027 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	4028 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	4029
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 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	4031 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	4032 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	4033 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	4034 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	4035 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	4036 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	4037 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	4038
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 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	4040 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	4041 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	4042 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	4043 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	4044 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	4045 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	4051 * Parameters:
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 * 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	4053 * 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	4054 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4055 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	4056 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4057 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	4058 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	4059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4060 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	4061 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	4062
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 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	4064 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	4065
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066 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	4067 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	4068
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4069 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	4070 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	4071 DW_MUTEX_UNLOCK;
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 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	4073 }
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
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 * 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	4077 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4078 * 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	4079 * 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	4080 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4081 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	4082 {
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 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	4084 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	4085
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4086 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	4087 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	4088
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 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	4090 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	4091 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	4092
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4093 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	4094 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	4095
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4096 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	4097 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	4098 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	4104 * Parameters:
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 * 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	4106 * 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	4107 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4108 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	4109 {
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 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	4111 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	4112 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	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 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	4115 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	4116 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	4117 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	4118 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	4119 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	4120 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	4121 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	4122 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	4123 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	4124 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	4125 DW_MUTEX_UNLOCK;
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 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	4127 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4128
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4129 /*
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 * 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	4131 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4132 * 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	4133 * 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	4134 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4135 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	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 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	4138 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	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 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	4141 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	4142 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	4143 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	4144 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	4145 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	4146 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4147 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	4148 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149
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 /*
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 * 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	4152 * Parameters:
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 * 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	4154 * 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	4155 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4156 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	4157 {
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 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	4159 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	4160 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	4161
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4162 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	4163 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	4164 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	4165
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 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	4167 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4168 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	4169 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	4170 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	4171 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4172 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	4173 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	4174 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175 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	4176 }
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 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	4178 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	4184 * Parameters:
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 * 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	4186 * 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	4187 * 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	4188 * 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	4189 * 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	4190 * (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	4191 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4192 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	4193 {
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	4194 GtkWidget *tmp;
1831 ce7543633fef Slight typo in that last commit fixed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1830 diff changeset	4195 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	4196 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	4197
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 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	4199 /* 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	4200 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	4201 /* 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	4202 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	4203 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	4204 {
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 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	4206 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	4207 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	4208 }
1832 cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1831 diff changeset	4209 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	4210 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	4211 {
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	4212 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	4213 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4214 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	4215 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	4216 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	4217 }
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 /*
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 * 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	4221 * Parameters:
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 * 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	4223 * 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	4224 * 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	4225 * (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	4226 * 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	4227 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4228 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	4229 {
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 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	4231 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	4232 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	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 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	4235 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	4236 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	4237
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4238 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	4239 {
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_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	4241 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	4242 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	4243 }
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 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	4245 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	4246 {
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 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	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 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	4250 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4251 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	4252 }
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
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 /*
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 * 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	4256 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4257 * 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	4258 * 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	4259 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4260 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	4261 {
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 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	4263 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	4264 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	4265
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4266 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	4267 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	4268 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	4269 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	4270 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	4271 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4272 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	4273 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	4274 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	4275 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	4276 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	4277 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4278 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4279 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4281 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4282 * Create a new 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	4283 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4284 * 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	4285 * 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	4286 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4287 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	4288 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4289 /* 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	4290 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	4291 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	4292
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 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	4294 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	4295 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	4296 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	4297
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4298 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	4299 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	4300 DW_MUTEX_UNLOCK;
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 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	4302 }
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 * 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	4306 * Parameters:
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 * 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	4308 * 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	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 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4311 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	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 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	4314 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	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;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 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	4319 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	4320 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	4321 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	4322 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	4323 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	4324 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	4325 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	4326 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4327 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	4328 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4329
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4330 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4331 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	4332 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	4333 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4334
775 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 /*
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 * 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	4337 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4338 * 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	4339 * 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	4340 * 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	4341 */
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 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	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 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	4345 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	4346 int _locked_by_me = FALSE;
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4347 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4348 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4349 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4350
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4351 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4352 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4353 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4354 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4355 #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	4356 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	4357 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	4358 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4359 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4360 #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	4361 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	4362 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	4363 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	4364 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	4365 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	4366 DW_MUTEX_UNLOCK;
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 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	4368 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4370 /*
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 * 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	4372 * Parameters:
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 * 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	4374 */
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 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	4376 {
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 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	4378 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	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 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	4381 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	4382 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	4383 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	4384 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4385 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	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
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 /*
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 * 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	4390 * Parameters:
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 * 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	4392 * 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	4393 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4394 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	4395 {
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 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	4397 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	4398
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4399 DW_MUTEX_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	4400 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	4401 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	4402 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	4403 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	4404 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	4405 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4406 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	4407 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4408
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4409 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4410 * 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	4411 * Parameters:
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 * 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	4413 * 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	4414 */
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 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	4416 {
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 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	4418 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	4419 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	4420 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	4421 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	4422 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	4423
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 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	4425 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	4426 {
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 DW_MUTEX_UNLOCK;
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 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	4429 }
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 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	4431 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	4432 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	4433 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	4434
775 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 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	4436 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	4437 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	4438 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	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 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	4441 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	4442 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	4443
775 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 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	4445 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	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 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	4448 }
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 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	4450 {
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 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	4452 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4453 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	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 * 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	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 * 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	4464 * 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	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 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	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 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	4469 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	4470
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 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	4472 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	4473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474 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	4475 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4476 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	4477 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	4478 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	4479 }
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 DW_MUTEX_UNLOCK;
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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4483 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4484 * 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	4485 * Parameters:
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 * 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	4487 * 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	4488 * (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	4489 * 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	4490 * 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	4491 * 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	4492 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4493 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	4494 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4495 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	4496 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	4497 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	4498 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	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 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	4501 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	4502
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 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	4504 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	4505 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	4506 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	4507 {
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	4508 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	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 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	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 DW_MUTEX_UNLOCK;
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 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	4514 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4515
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4516 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	4517
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 /* 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	4519 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	4520 {
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 /* 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	4522 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	4523 {
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 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	4525 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	4526 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	4527 {
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 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	4529 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	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 }
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 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	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 DW_MUTEX_UNLOCK;
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 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	4536 }
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 }
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 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	4539 }
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
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 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	4542 {
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 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	4544 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4545 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	4546 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4547 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4548 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	4549 }
775 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 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	4552 {
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 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	4554 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4556 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4557 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4559 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4560 * Sets the 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	4561 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4563 * id: An ID to be used to specify the icon,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4564 * (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	4565 * 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	4566 * 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	4567 * 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	4568 * 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	4569 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4570 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	4571 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4572 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	4573 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	4574
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4575 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	4576 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	4577
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 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	4579 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	4580 {
775 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 * 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	4583 * 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	4584 */
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4585 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	4586 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	4587
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4588 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	4589 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4590 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	4591 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	4592 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	4593 /* 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	4594 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	4595 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4596 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4597 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	4598 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4599
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4600 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	4601 /* 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	4602 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	4603 }
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4604 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	4605 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	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 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	4608 {
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4609 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	4610 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	4611 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	4612
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4613 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4614 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	4615 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4616 else
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4617 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	4618 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4619 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4620 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4621
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4623 * 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	4624 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4625 * 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	4626 * 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	4627 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4628 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	4629 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4630 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	4631 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	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 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	4634 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	4635 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	4636 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	4637 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	4638 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	4639 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	4640 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	4641 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	4642 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	4643 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644 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	4645 }
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 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	4647 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	4648 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	4649 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4650 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4651 * 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	4652 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4653 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	4654 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	4655 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	4656 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	4657 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	4658 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4660 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4661
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4662 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4663 * 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	4664 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4665 * 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	4666 * 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	4667 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4668 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	4669 {
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4670 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	4671
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4672 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	4673 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	4674 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	4675 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	4676 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	4677 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	4678 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4679
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4680 /*
775 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 * 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	4682 * Parameters:
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 * 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	4684 * 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	4685 * 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	4686 */
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 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	4688 {
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4689 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	4690 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	4691
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 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	4693 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	4694 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	4695 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	4696 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	4697 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	4698 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	4699
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 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	4701 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	4702 }
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 /*
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 * 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	4706 * Parameters:
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 * 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	4708 */
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 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	4710 {
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 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	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 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	4714 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	4715 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4716 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4717
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4718 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4719 * 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	4720 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4721 * 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	4722 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4723 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	4724 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4725 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	4726
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4727 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	4728 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	4729 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4730 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4731
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 /*
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 * 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	4734 * Parameters:
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 * 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	4736 * 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	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 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	4739 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4740 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	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(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	4745 {
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 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	4747 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4748 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	4749 {
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 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	4751 {
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	4752 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	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 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	4755 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	4756 DW_MUTEX_UNLOCK;
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 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	4758 }
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 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	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 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	4763 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	4764 DW_MUTEX_UNLOCK;
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 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	4766 }
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 * 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	4770 * Parameters:
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 * 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	4772 * 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	4773 * 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	4774 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	4775 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	4776 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4777 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	4778 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	4779
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4780 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	4781 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	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 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	4784
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 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	4786 {
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 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	4788 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	4789
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 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	4791 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	4792 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	4793 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	4794 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	4795 }
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 DW_MUTEX_UNLOCK;
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 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	4799 }
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 /*
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 * 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	4803 * Parameters:
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 * 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	4805 * 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	4806 * 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	4807 * 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	4808 */
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 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	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 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	4812 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	4813
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 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	4815 /* 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	4816 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	4817 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	4818 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	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 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	4821
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 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	4823 {
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 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	4825 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	4826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4827 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	4828 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	4829 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	4830 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	4831 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	4832 {
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 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	4834 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	4835 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4836 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4837 }
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 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	4843 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844 * 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	4845 * 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	4846 * 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	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 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	4849 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4850 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	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 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	4853 *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	4854 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	4855 *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	4856
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 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	4858 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	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 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	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 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	4863 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4864 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	4865
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4866 if(bytes)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4867 *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	4868 if(lines)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4869 *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	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 }
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 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	4877 * Parameters:
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 * 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	4879 * 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	4880 * 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	4881 */
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 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	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 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	4885
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4886 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	4887 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	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 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	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 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	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 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	4894 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	4895
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 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	4897 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	4898 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	4899 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	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 }
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 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 /*
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 * 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	4907 * Parameters:
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 * 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	4909 */
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 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	4911 {
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 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	4913
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914 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	4915 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	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 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	4918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4919 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	4920 {
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 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	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 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	4924 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	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 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	4932 * Parameters:
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 * 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	4934 * 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	4935 */
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 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	4937 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4938 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	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 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	4941 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	4942 {
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 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	4944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4945 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	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 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	4948 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	4949 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	4950
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4951 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	4952 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	4953 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	4954 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	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 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	4957 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	4958 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 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	4960 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	4961 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	4962 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	4963 }
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_UNLOCK;
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 }
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 /*
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 * 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	4970 * Parameters:
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 * 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	4972 * 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	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 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	4975 {
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 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	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_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	4979 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	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 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	4982
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 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	4984 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	4985 }
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 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4988
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4989 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4990 * 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	4991 * Parameters:
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 * 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	4993 * 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	4994 */
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 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	4996 {
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 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	4998
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 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	5000 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	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 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	5003
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5004 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	5005 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009
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 /*
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5011 * 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	5012 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5013 * 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	5014 * 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	5015 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5016 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	5017 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5018 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5019
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	5020 /*
775 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 * 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	5022 * Parameters:
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 * 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	5024 * 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	5025 */
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 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	5027 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5028 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	5029
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 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	5031 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	5032 {
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 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	5034
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5035 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	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 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	5038 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	5039 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	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 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	5042 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	5043 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	5044 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 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	5046 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	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 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	5049 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	5050 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	5051 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	5052 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	5053 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5054 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5056 }
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 /*
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 * 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	5060 * Parameters:
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 * 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	5062 * 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	5063 * 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	5064 * 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	5065 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5066 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	5067 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068 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	5069
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 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	5071 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	5072 {
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 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	5074
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 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	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 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	5078 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	5079
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 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	5081 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	5082 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	5083 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	5084 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5085 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 DW_MUTEX_UNLOCK;
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 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	5088 }
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
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 /*
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 * 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	5092 * Parameters:
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 * 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	5094 */
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 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	5096 {
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 }
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 /*
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 * 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	5101 * Parameters:
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 * 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	5103 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 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	5105 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5107
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	5108 /* 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	5109 * 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	5110 */
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	5111 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	5112 {
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	5113 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	5114 {
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	5115 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	5116 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	5117 }
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	5118 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	5119 }
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	5120
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5121 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5122 * 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	5123 * Parameters:
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 * 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	5125 * 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	5126 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 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	5128 {
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 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	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 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	5132 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	5133 {
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	5134 /* 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	5135 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	5136 {
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	5137 /* 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	5138 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	5139 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	5140 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	5141 }
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	5142 }
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	5143 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	5144 {
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	5145 /* 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	5146 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	5147 /* 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	5148 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	5149 }
775 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 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5152
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 /*
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 * 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	5155 * Parameters:
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 * 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	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 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	5159 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5160 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	5161 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	5162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5163 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	5164 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	5165
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5166 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	5167 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	5168 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	5169 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5170 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	5171 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	5172
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5173 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	5174 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	5175 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	5176 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	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 DW_MUTEX_UNLOCK;
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 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	5180 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5183 * 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	5184 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5185 * 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	5186 * 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	5187 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5188 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	5189 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5190 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	5191 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	5192
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5193 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194 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	5195
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5196 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	5197 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	5198 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	5199 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5200 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	5201
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5202 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	5203 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	5204 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	5205 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	5206 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207 DW_MUTEX_UNLOCK;
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
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 * 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	5212 * Parameters:
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 * 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	5214 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5215 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	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 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	5218 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	5219
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 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	5221 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	5222
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 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	5224 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	5225 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	5226 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	5227 DW_MUTEX_UNLOCK;
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 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	5229 }
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
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 * 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	5233 * Parameters:
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 * 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	5235 * 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	5236 */
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 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	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 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	5240 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	5241
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 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	5243 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	5244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5245 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	5246 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	5247 if(adjustment)
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5248 {
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5249 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	5250 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	5251 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	5252 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5253 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	5258 * Parameters:
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 * 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	5260 * 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	5261 * 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	5262 */
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 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	5264 {
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 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	5266 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	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 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	5269 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	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 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	5272 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	5273 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	5274 {
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 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	5276 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	5277 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	5278 }
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 DW_MUTEX_UNLOCK;
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 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	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 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	5286 * 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	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_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	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
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 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	5293 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	5294 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	5299 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 * 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	5301 * 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	5302 * 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	5303 */
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 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	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 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	5307 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	5308 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	5309
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 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	5311 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	5312 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	5313 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	5314 /*
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 * 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	5316 */
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 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	5318 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	5319 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	5324 * Parameters:
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 * 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	5326 * 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	5327 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5328 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	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 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	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 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	5333 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	5334 DW_MUTEX_UNLOCK;
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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5337 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5338 * 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	5339 * Parameters:
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 * 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	5341 */
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 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	5343 {
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 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	5345 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	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 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	5348 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	5349 DW_MUTEX_UNLOCK;
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
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 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	5352 }
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
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 * 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	5356 * Parameters:
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 * 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	5358 */
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 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	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 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	5362 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	5363
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 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	5365 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	5366 DW_MUTEX_UNLOCK;
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 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	5369 }
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
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 * 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	5373 * Parameters:
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 * 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	5375 * 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	5376 */
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 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	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 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	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 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	5382 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	5383 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5386 /*
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 * 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	5388 * Parameters:
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 * 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	5390 * 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	5391 * 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	5392 * 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	5393 * 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	5394 * 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	5395 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5396 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	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 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	5399 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	5400 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	5401 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	5402 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	5403 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	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 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	5406 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	5407
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 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	5409 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	5410 && 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	5411 (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	5412 {
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 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	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 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	5416
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 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	5418 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	5419 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	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 DW_MUTEX_UNLOCK;
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 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	5424 }
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
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 /*
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 * 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	5428 * Parameters:
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 * 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	5430 * 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	5431 * 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	5432 * 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	5433 * 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	5434 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5435 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	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 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	5438 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	5439 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	5440 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	5441 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	5442 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	5443
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 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	5445 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	5446
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5447 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	5448 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	5449 && 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	5450 (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	5451 {
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 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	5453
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5454 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	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 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	5457 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	5458 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	5459 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5460 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5461
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5462 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	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
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 * 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	5467 * Parameters:
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 * 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	5469 * 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	5470 * 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	5471 * 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	5472 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5473 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	5474 {
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 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	5476 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	5477 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	5478 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	5479
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 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	5481 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	5482
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 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	5484 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	5485 && 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	5486 (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	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 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	5489
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5490 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	5491 }
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 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	5497 * Parameters:
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 * 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	5499 * 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	5500 * 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	5501 */
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 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	5503 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 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	5505 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	5506 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	5507
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 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	5509 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	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_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	5512 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	5513 && 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	5514 (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	5515 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	5516 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	5521 * Parameters:
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 * 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	5523 * 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	5524 */
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 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	5526 {
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 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	5528 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	5529 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	5530 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	5531
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 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	5533 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	5534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5535 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	5536 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	5537
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 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	5539 (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	5540 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	5541 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5542 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5543 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5544 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5545 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5546 }
775 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 DW_MUTEX_UNLOCK;
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 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	5549 }
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
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 /*
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 * 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	5553 * Parameters:
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 * 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	5555 * 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	5556 */
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 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	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 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	5560 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	5561 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	5562 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	5563
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 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	5565 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	5566
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_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	5568 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	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 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	5571 (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	5572 {
1900 969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5573 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5574
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5575 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	5576 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	5577 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5579 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	5580 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5583 * 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	5584 * Parameters:
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 * 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	5586 * 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	5587 */
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 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	5589 {
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 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	5591 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	5592 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	5593 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	5594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5595 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	5596 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	5597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 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	5599 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	5600 && 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	5601 (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	5602 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	5603 DW_MUTEX_UNLOCK;
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 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	5605 }
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
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 * 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	5609 * Parameters:
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 * 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	5611 * 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	5612 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613 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	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 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	5616 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	5617 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	5618
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 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	5620 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	5621
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 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	5623 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	5624 && 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	5625 (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	5626 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 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	5628 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	5629
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 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	5631 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	5632 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5635 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5637 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	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 *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	5640 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	5641
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 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	5643 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	5644 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	5645 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	5646
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 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	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 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	5650 _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	5651 } 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	5652 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5653 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656 * 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	5657 * Parameters:
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 * 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	5659 */
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 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	5661 {
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 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	5663 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	5664 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	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 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	5667 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	5668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669 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	5670 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	5671 && 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	5672 (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	5673 {
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 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	5675
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 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	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 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	5679 _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	5680 } 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	5681 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682 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	5683 }
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 DW_MUTEX_UNLOCK;
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 }
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 * 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	5689 * Parameters:
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 * 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	5691 * 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	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 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	5694 {
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 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	5696 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	5697 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	5698
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5699 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	5700 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	5701
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 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	5703 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	5704 && 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	5705 (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	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 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	5708 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	5709 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	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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	5716 * Parameters:
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 * 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	5718 * 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	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 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	5721 {
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 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	5723 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	5724 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	5725
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5726 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	5727 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	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 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	5730 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	5731 && 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	5732 (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	5733 {
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 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	5735 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	5736 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5739 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5740
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 /*
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 * 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	5743 * Parameters:
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 * 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	5745 * 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	5746 */
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 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	5748 {
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 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	5750 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	5751 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	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 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	5754 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	5755
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 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	5757 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	5758 && 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	5759 (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	5760 {
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 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	5762 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	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 DW_MUTEX_UNLOCK;
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
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5767 #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	5768
775 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 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	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 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	5772 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	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 GtkListStore *store;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5775 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	5776 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	5777 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	5778 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	5779 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	5780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5781 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	5782 /* 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	5783 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	5784 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	5785
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5786 /* 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	5787 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	5788 /* 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	5789 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	5790 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	5791 /* 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	5792 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	5793 {
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	5794 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	5795 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5796 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	5797 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	5798 }
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	5799 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	5800 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5801 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	5802 }
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 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	5804 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5805 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	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 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	5808 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5809 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	5810 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5811 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	5812 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5813 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	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 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	5816 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5817 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	5818 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5820 /* 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	5821 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	5822 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	5823 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	5824 /* 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	5825 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	5826 {
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	5827 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	5828 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	5829 col = gtk_tree_view_column_new();
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5830 rend = NULL;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5831 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	5832
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	5833 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	5834 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5835 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	5836 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	5837 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	5838 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	5839 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	5840 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	5841 }
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	5842 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	5843 {
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	5844 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	5845 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	5846 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	5847 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5848 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	5849 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5850 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	5851 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	5852 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	5853 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	5854 }
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 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	5856 {
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 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	5858 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	5859 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	5860 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	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 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5864 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	5865 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	5866 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	5867 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	5868 }
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 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	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 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	5872 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	5873 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	5874 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	5875 }
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	5876 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	5877 params[2] = tree;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5878 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	5879 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	5880 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5881 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5882 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	5883 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5884 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	5885 }
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5886 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5887 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5888 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	5889 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5890 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	5891 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5892 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	5893 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5894 /* 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	5895 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	5896 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	5897 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	5898 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	5899 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	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 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	5902 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903 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	5904 {
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 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	5906 }
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	5907 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	5908 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	5909 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	5910 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	5911 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	5912 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	5913 }
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 /*
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 * 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	5917 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5918 * 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	5919 * 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	5920 * 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	5921 * 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	5922 * 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	5923 * (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	5924 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5925 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	5926 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5927 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	5928 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5930 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5931 * 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	5932 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5933 * 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	5934 * 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	5935 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	5936 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	5937 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5938 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	5939
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5940 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	5941 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5942
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5943 /*
775 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 * 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	5945 * Parameters:
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 * 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	5947 * 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	5948 * 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	5949 * 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	5950 */
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 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	5952 {
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	5953 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	5954 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	5955 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	5956
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5957 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	5958 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	5959
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5960 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	5961 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	5962
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5963 _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	5964
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5965 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5966 {
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5967 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	5968 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5969 }
775 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 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	5971 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	5972 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	5973 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5974
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 /*
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 * 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	5977 * Parameters:
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 * 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	5979 * 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	5980 * 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	5981 * 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	5982 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5983 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	5984 {
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5985 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	5986 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5987
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	5988 /* 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	5989 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	5990 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5991 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5992 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5993 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	5994 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	5995
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5996 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	5997 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5998 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	5999 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	6000 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	6001 }
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	6002 }
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	6003 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	6004 }
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	6005
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6007 * 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	6008 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6009 * 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	6010 * 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	6011 * (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	6012 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6013 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	6014 {
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 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	6016 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	6017 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	6018 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	6019
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6020 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	6021 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	6022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6023 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	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 /* 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	6026 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	6027 {
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 /* 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	6029 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	6030 {
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 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	6032 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	6033 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	6034 {
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 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	6036 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6039 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	6040 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6041 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	6042 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6043 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6044
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6045 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	6046 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	6047 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6048 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	6049 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6050
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6051 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052 * 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	6053 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054 * 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	6055 * 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	6056 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6057 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	6058 {
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6059 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	6060 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	6061 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	6062
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6064 * 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	6065 * 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	6066 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6067 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	6068 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6069 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	6070 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	6071 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	6072 /* 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	6073 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	6074 return 0;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6075 DW_MUTEX_LOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6076 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	6077 DW_MUTEX_UNLOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	6078 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	6079 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	6080 }
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 /*
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 * 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	6084 * Parameters:
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 * 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	6086 */
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 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	6088 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	6089 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	6090
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6091 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	6092 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6093 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6097 /*
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 * 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	6099 * Parameters:
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 * 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	6101 * 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	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 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	6104 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6105 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	6106 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	6107 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	6108 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	6109
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6110 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	6111 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	6112
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6113 /* 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	6114 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	6115 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	6116
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6117 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	6118 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6119 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6120
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	6121 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	6122
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6123 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	6124 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6125 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	6126 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6127 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	6128 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	6129 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6130 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	6131 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	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 /*
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 * 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	6136 * 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	6137 */
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6138 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	6139 {
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	6140 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	6141 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	6142 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	6143 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	6144 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	6145
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6146 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	6147 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	6148
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6149 /* 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	6150 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	6151 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	6152
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6153 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	6154 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6155 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6156
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	6157 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	6158 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	6159 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	6160 {
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	6161 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	6162 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6163
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6164 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	6165 {
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	6166 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	6167 {
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	6168 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	6169 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	6170 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	6171 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	6172
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6173 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	6174 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	6175 }
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	6176 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	6177 {
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	6178 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	6179 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	6180
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6181 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	6182 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6183 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	6184 {
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	6185 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	6186 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	6187 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6188 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	6189 {
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	6190 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	6191
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6192 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	6193 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6194 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	6195 {
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	6196 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	6197 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6198 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	6199 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	6200
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6201 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	6202 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	6203 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	6204 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	6205
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6206 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	6207 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6208 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	6209 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6210 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	6211 {
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	6212 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	6213 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6214 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	6215 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	6216
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6217 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	6218 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	6219 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	6220 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	6221
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 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	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, 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	6225 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6226 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6227 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6228 DW_MUTEX_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	6229 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6230
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6231 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6232 * 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	6233 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6234 * 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	6235 * 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	6236 * 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	6237 * 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	6238 * 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	6239 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 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	6241 {
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	6242 _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	6243 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6245 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6246 * 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	6247 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6248 * 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	6249 * 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	6250 * 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	6251 * 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	6252 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6253 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	6254 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6255 _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	6256 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6259 * 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	6260 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6261 * 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	6262 * 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	6263 * 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	6264 * 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	6265 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6266 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	6267 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6268 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	6269 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6270
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6272 * 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	6273 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6274 * 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	6275 * 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	6276 * 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	6277 * 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	6278 * 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	6279 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6280 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	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 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	6283 }
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
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 /*
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 * 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	6287 * Parameters:
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 * 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	6289 * 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	6290 * 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	6291 * 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	6292 * 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	6293 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6294 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	6295 {
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	6296 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	6297
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	6298 _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	6299 }
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
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 /*
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 * 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	6303 * Parameters:
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 * 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	6305 * 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	6306 * 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	6307 * 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	6308 * 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	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 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	6311 {
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	6312 _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	6313 }
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
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 /*
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 * 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	6317 * Parameters:
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 * 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	6319 * 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	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 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	6322 {
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	6323 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	6324 int flag, rc = 0;
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	6325 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	6326 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	6327
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6328 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	6329 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	6330 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	6331 {
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 DW_MUTEX_UNLOCK;
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 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	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
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	6336 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	6337 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	6338
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 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	6340 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	6341 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	6342 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	6343 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	6344 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	6345 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	6346 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	6347 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	6348 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	6349 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	6350 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	6351 DW_MUTEX_UNLOCK;
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 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	6353 }
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
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 /*
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 * 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	6357 * Parameters:
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 * 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	6359 * 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	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 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	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 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	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 /*
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6367 * 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	6368 * Parameters:
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6369 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6370 * 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	6371 * 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	6372 * 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	6373 * 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	6374 */
1291 b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1289 diff changeset	6375 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	6376 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6377 #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	6378 GtkWidget *cont;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6379 int _locked_by_me = FALSE;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6380 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6381 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	6382
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6383 /* 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	6384 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	6385 {
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6386 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	6387 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	6388 else
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6389 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	6390 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6391 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	6392 #endif
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6393 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6394
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6395 /*
775 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 * 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	6397 * Parameters:
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 * 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	6399 * 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	6400 * 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	6401 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6402 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	6403 {
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6404 GtkWidget *cont;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6405 int _locked_by_me = FALSE;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6406
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6407 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6408 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	6409
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6410 /* 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	6411 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	6412 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6413 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	6414
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6415 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	6416 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6417 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	6418 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6419 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6420 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	6421 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6422
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	6423 /* 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	6424 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	6425 {
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	6426 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	6427 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	6428 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	6429
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6430 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	6431 /* 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	6432 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	6433 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	6434
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6435 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6436 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6437 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6438
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6439 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6440 {
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	6441 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	6442 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6443
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6444 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	6445 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6446 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	6447 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6448 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6449 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	6450 }
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
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 * 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	6454 * 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	6455 * 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	6456 * 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	6457 * 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	6458 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6459 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	6460 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6461 _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	6462 }
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	6463
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	6464 /*
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	6465 * 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	6466 * 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	6467 * 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	6468 * 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	6469 * 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	6470 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6471 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	6472 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6473 _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	6474 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6475
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6476 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6477 * 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	6478 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6479 * 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	6480 * 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	6481 * 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	6482 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6483 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	6484 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6485 _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	6486 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6487
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6488 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6489 * 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	6490 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6491 * 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	6492 * 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	6493 * 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	6494 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6495 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	6496 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6497 _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	6498 }
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	6499
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	6500 /*
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	6501 * 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	6502 * 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	6503 * 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	6504 * 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	6505 * 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	6506 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6507 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	6508 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6509 /* 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	6510 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6511
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6512 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6513 * 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	6514 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6515 * 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	6516 * 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	6517 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6518 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	6519 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6520 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6521 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	6522 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	6523
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6524 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	6525 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	6526
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6527 /* 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	6528 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	6529 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	6530
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6531 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6532 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6533 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6534 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	6535
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	6536 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	6537
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6538 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	6539 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6540 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	6541 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	6542 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6543
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6544 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	6545 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6546 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6547 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6548
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6549 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	6550 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6551 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	6552 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6553
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 /*
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 * 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	6556 * Parameters:
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 * 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	6558 * 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	6559 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6560 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	6561 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6562 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6563 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	6564 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	6565
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6566 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	6567 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	6568
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6569 /* 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	6570 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	6571 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	6572
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6573 if(store)
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 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	6576 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	6577
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6578 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	6579 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6580 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	6581 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6582
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6583 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6584 * 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	6585 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6586 * 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	6587 * 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	6588 * 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	6589 * 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	6590 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6591 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	6592 {
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6593 GtkWidget *cont;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6594 int _locked_by_me = FALSE;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6595
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6596 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6597 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	6598
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6599 /* 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	6600 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	6601 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	6602 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	6603
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6604 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6605 {
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	6606 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	6607 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6608 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6609 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	6610 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6611
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6612 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6613 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6614 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6615 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6616 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6617 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6618
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6619 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6620
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6621 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6622 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6623 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6624 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6625 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6626 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6627 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6628 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6629 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6630 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6631 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6632 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6633 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6634 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6635 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6636 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6637 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6638 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6639 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6640 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6641 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6642 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6643 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6644 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6645 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6646 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6647 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6648 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6649 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6650 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6651 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6652 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6653 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6654 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6655 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6656 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	6657 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6658
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6659 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6660 * 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	6661 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6662 * 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	6663 * 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	6664 * 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	6665 * 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	6666 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6667 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	6668 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6669 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6670 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	6671 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	6672 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	6673 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	6674
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6675 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	6676 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	6677
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6678 /* 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	6679 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	6680 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	6681
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6682 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6683 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6684 /* 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	6685 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	6686 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6687 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	6688 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	6689 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6690 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6691 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	6692
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6693 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6694 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6695 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	6696
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6697 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6698 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6699 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6700
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6701 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	6702 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6703 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	6704 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	6705 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6706 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6707 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6708 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	6709 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	6710 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6711 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6712 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	6713 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6714 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6715
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6716 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	6717 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6718 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6719 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6720
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6721 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	6722 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6723 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	6724 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6725 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	6726 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6727 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6728 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6729 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6730 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6731
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6732 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	6733 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6734 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	6735 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	6736 }
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 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6739 /* 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	6740 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	6741 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6742 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6743 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6744 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6745 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6746 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	6747 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	6748 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6749
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6750 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6751 * 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	6752 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6753 * 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	6754 * 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	6755 * 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	6756 * 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	6757 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6758 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	6759 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6760 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6761 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	6762 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	6763 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	6764 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	6765
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6766 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	6767 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	6768
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6769 /* 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	6770 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	6771 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	6772
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6773 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6774 {
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	6775 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	6776 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	6777
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6778 /* 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	6779 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	6780 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6781 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	6782 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	6783
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6784 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6785 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6786 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	6787
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6788 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6789 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6790 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	6791
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6792 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6793 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6794 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6795
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6796 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	6797 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6798 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	6799 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	6800 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6801 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6802 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6803 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	6804 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	6805 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6806 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6807 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	6808 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6809 /* 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	6810 * 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	6811 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6812 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6813 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6814 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6815 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6816 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6817
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6818 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	6819 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6820 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	6821 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	6822 }
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 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6825 /* 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	6826 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	6827 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6828 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6829 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6830 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6831 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6832 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	6833 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	6834 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6835
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6836 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	6837 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6838 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	6839 void *thisdata;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6840 int retval = FALSE;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6841
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6842 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	6843 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6844 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	6845 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6846 /* 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	6847 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	6848 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	6849 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6850 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6851 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	6852 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6853 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6854 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6855 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6856 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6857 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	6858 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6859
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6860 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	6861 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6862 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6863 GtkListStore *store = NULL;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6864 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	6865
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6866 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6867 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	6868
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6869 /* 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	6870 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	6871 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	6872
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6873 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6874 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6875 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6876
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6877 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	6878 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6879 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	6880
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6881 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6882 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6883 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	6884 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	6885 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6886 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6887 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6888 DW_MUTEX_UNLOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6889 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6890
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6891 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6892 * 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	6893 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6894 * 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	6895 * 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	6896 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6897 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	6898 {
48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	6899 _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	6900 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6901
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6902 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6903 * 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	6904 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6905 * 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	6906 * 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	6907 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6908 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	6909 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6910 _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	6911 }
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 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	6914 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6915 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6916 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	6917 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	6918
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6919 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	6920 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	6921
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6922 /* 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	6923 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	6924 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	6925
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6926 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6927 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6928 GtkTreeIter iter;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6929 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	6930
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6931 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	6932 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6933 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	6934 rows--;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6935 }
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 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	6938 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6939 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	6940 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6941
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 * 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	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).
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_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	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_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	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 * 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	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).
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_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	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_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	6962 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6963
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6964 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6965 * 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	6966 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6967 * 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	6968 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6969 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	6970 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6971 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6972 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	6973
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6974 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	6975 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	6976
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6977 /* 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	6978 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	6979 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	6980 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	6981 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6982
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6983 /* 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	6984 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	6985 {
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6986 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6987 long x, y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6988 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	6989
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6990 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	6991
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6992 event.button = button;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6993 event.x = x;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6994 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	6995
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6996 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	6997 }
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6998
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6999 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7000 * 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	7001 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7002 * 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	7003 * 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	7004 * 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	7005 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7006 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	7007 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7008 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7009 GdkPixbuf *pixbuf;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7010 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7011
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7012 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7013 pixbuf = _find_pixbuf(icon, NULL, NULL);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7014 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7015 if(bubbletext)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7016 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7017 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	7018 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	7019 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	7020 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	7021 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7023 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7024 * 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	7025 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7026 * 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	7027 * 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	7028 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7029 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	7030 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7031 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7032 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7033
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7034 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7035 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	7036 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	7037 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	7038 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7039
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7040 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7041 * 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	7042 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7043 * 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	7044 * 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	7045 * 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	7046 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7047 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	7048 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7049 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	7050 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	7051
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 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	7053 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	7054 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	7055 \| 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	7056 \| 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	7057 \| 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	7058 \| 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	7059 \| 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	7060 \| 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	7061 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	7062 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	7063 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	7064 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	7065 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	7066 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7067 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	7068 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7069
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7070 /* 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	7071 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	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 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	7074 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7075 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	7076 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	7077 }
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 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	7079 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	7080 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	7081 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7082
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7083 /* 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	7084 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7085 * 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	7086 * 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	7087 * 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	7088 */
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 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	7090 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7091 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	7092 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	7093
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7094 *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	7095 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7096
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 /* 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	7098 * Parameters:
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 * 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	7100 * 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	7101 * 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	7102 */
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 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	7104 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7105 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	7106
775 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 if(value == DW_CLR_DEFAULT)
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7108 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7109 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7110 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7111 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	7112 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7113 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7114 }
775 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 else
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7116 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7117 GdkRGBA color = _internal_color(value);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7118
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7119 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7120 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7121 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	7122 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	7123 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7124 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7125 }
775 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
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7128 #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	7129 /* 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	7130 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7131 * 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	7132 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7133 * 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	7134 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7135 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	7136 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7137 GtkColorChooser *cd;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7138 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	7139 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	7140 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	7141
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7142 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	7143 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	7144 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	7145 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	7146
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7147 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	7148
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7149 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	7150 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7151 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	7152 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	7153 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7154 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	7155 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	7156 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7157 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7158 #else
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7159 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	7160
775 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 /* 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	7162 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	7163 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7164 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	7165 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	7166 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	7167
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7168 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	7169 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	7170
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 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	7172 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	7173 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	7174 _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	7175 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	7176 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	7177 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	7178 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7179
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7180 /* 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	7181 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	7182 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7183 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	7184 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	7185
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7186 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	7187 _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	7188 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	7189 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	7190 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7192 /* 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	7193 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7194 * 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	7195 * 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	7196 * 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	7197 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7198 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	7199 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7200 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	7201 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	7202 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	7203 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	7204 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	7205 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	7206
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7207 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	7208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7209 /* 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	7210 * 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	7211 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7212 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	7213 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7214 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7215 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	7216 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7217
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7218 _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	7219
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 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	7221
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7222 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	7223
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 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	7225 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	7226 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	7227 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	7228
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7229 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	7230 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	7231 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	7232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7233 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	7234
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 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	7236 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	7237 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	7238 DW_MUTEX_UNLOCK;
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 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	7240 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7241 #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	7242
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7243 /* 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	7244 * Parameters:
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 * 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	7246 * 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	7247 * 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	7248 * 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	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 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	7251 {
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 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	7253 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7254 #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	7255 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	7256 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7257 #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	7258
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 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	7260 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7261 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7262 GdkWindow *window = gtk_widget_get_window(handle);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7263 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7264 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7265 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7266 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7267 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7268 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7269 #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	7270 clip = gdk_window_get_clip_region(window);
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	7271 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7272 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	7273 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7274 cr = gdk_cairo_create(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	7275 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7276 }
775 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 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	7278 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	7279 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	7280 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7281 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	7282
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7283 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	7284 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	7285 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	7286 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7287 #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	7288 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	7289 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7290 /* 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	7291 * 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	7292 */
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	7293 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	7294 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	7295 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7296 #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	7297 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	7298 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7299 DW_MUTEX_UNLOCK;
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
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 /* 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	7303 * Parameters:
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 * 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	7305 * 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	7306 * 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	7307 * 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	7308 * 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	7309 * 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	7310 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7311 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	7312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7313 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	7314 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7315 #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	7316 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	7317 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7318 #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	7319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7320 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	7321 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7322 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7323 GdkWindow *window = gtk_widget_get_window(handle);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7324 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7325 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7326 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7327 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7328 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7329 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7330 #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	7331 clip = gdk_window_get_clip_region(window);
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	7332 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7333 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	7334 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7335 cr = gdk_cairo_create(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	7336 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7337 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7338 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	7339 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	7340 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	7341 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7342 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	7343
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7344 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	7345 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	7346 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	7347 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	7348 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7349 #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	7350 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	7351 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7352 /* 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	7353 * 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	7354 */
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	7355 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	7356 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	7357 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7358 #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	7359 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	7360 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7361 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7362 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7363
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7364 /* 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	7365 * Parameters:
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 * 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	7367 * 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	7368 * 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	7369 * 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	7370 * 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	7371 * 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	7372 */
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	7373 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	7374 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7375 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	7376 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	7377 int z;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7378 #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	7379 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	7380 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7381 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7383 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	7384 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7385 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7386 GdkWindow *window = gtk_widget_get_window(handle);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7387 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7388 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7389 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7390 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7391 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7392 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7393 #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	7394 clip = gdk_window_get_clip_region(window);
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	7395 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7396 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	7397 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7398 cr = gdk_cairo_create(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	7399 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7400 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7401 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	7402 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	7403 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	7404 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7405 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	7406
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7407 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	7408 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	7409
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7410 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	7411 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	7412 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	7413 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	7414 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7415 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	7416 }
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	7417 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	7418 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	7419 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7420 #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	7421 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	7422 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7423 /* 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	7424 * 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	7425 */
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	7426 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	7427 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	7428 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7429 #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	7430 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	7431 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7432 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7433 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7434
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7435 /* 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	7436 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7437 * 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	7438 * 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	7439 * 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	7440 * 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	7441 * 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	7442 * 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	7443 * 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	7444 */
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	7445 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	7446 {
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 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	7448 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7449 #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	7450 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	7451 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7452 #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	7453
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7454 DW_MUTEX_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	7455 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7456 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7457 GdkWindow *window = gtk_widget_get_window(handle);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7458 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7459 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7460 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7461 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7462 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7463 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7464 #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	7465 clip = gdk_window_get_clip_region(window);
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	7466 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7467 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	7468 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7469 cr = gdk_cairo_create(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	7470 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7471 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7472 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	7473 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	7474 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	7475 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7476 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	7477
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7478 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	7479 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	7480
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7481 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	7482 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	7483 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	7484 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	7485 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	7486 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	7487 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	7488 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	7489 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7490 #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	7491 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	7492 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7493 /* 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	7494 * 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	7495 */
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	7496 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	7497 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	7498 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7499 #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	7500 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	7501 }
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 DW_MUTEX_UNLOCK;
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 }
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
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7505 /* 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	7506 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7507 * 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	7508 * 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	7509 * 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	7510 * 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	7511 * 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	7512 * 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	7513 * 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	7514 * 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	7515 * 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	7516 * 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	7517 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7518 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	7519 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7520 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	7521 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7522 #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	7523 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	7524 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7525 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7526
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7527 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	7528 if(handle)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7529 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7530 GdkWindow *window = gtk_widget_get_window(handle);
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7531 /* Safety check for non-existant windows */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7532 if(!window \|\| !GDK_IS_WINDOW(window))
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7533 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7534 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	7535 return;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7536 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7537 #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	7538 clip = gdk_window_get_clip_region(window);
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	7539 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7540 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	7541 #else
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7542 cr = gdk_cairo_create(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	7543 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7544 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7545 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	7546 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	7547 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7548 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7549 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	7550 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	7551 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	7552
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7553 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	7554 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	7555
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7556 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	7557 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	7558 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7559 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	7560 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	7561 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	7562 else
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7563 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7564 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	7565 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	7566 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	7567 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	7568 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	7569
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	7570 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	7571 }
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	7572 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	7573 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	7574 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7575 #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	7576 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	7577 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7578 /* 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	7579 * 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	7580 */
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	7581 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	7582 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	7583 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7584 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7585 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	7586 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7587 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	7588 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7589
775 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 /* 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	7591 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7592 * 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	7593 * 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	7594 * 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	7595 * 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	7596 * 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	7597 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7598 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	7599 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7600 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	7601 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	7602 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	7603 char tmpname, fontname = "monospace 10";
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7604 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7605 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	7606 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7607 #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	7608
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7609 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	7610 return;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7611
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7612 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	7613 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	7614 {
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7615 GdkWindow *window = gtk_widget_get_window(handle);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7616 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7617 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7618 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7619 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7620 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7621 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7622 #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	7623 clip = gdk_window_get_clip_region(window);
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	7624 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7625 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	7626 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7627 cr = gdk_cairo_create(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	7628 #endif
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7629 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7630 fontname = tmpname;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7631 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7632 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	7633 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7634 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7635 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7636 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	7637 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	7638 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	7639 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7640 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	7641 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7642 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	7643 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	7644 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7645 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	7646
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7647 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	7648 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7649 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	7650
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7651 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	7652 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7653 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	7654 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	7655
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7656 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	7657 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	7658
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7659 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	7660 /* 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	7661 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	7662 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7663 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	7664 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	7665 (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	7666 (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	7667 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	7668 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7669 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	7670 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7671 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	7672 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	7673 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7674 /* 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	7675 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	7676 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	7677
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 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	7679 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7680 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	7681 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7682 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	7683 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7684 #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	7685 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	7686 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7687 /* 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	7688 * 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	7689 */
1930 fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7690 if(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	7691 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	7692 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7693 #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	7694 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	7695 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7696 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7697 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7698
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7699 /* 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	7700 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7701 * 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	7702 * 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	7703 * 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	7704 * 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	7705 * 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	7706 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7707 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	7708 {
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 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	7710 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	7711 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	7712 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	7713
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 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	7715 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	7716
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7717 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	7718 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	7719 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7720 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	7721 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	7722 {
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 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	7724 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	7725 }
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 }
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 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	7728 {
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	7729 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	7730 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	7731 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	7732 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	7733 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7734
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7735 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	7736 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	7737 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7738 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	7739
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7740 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	7741 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 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	7743
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7744 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	7745 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7746 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	7747
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7748 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	7749 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	7750 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	7751
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7752 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	7753 *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	7754 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	7755 *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	7756
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 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	7758 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7759 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	7760 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7761 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	7762 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7763 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	7764 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	7765 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 }
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
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 * 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	7770 * Parameters:
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 * 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	7772 * 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	7773 * 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	7774 * 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	7775 * 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	7776 * 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	7777 * 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	7778 * 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	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 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	7781 {
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 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	7783 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	7784
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7785 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	7786 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	7787
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7788 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	7789 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	7790
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7791 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	7792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7793
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7794 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	7795 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	7796 /* 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	7797 * 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	7798 */
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7799 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	7800 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	7801 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	7807 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7808 * 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	7809 * 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	7810 * 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	7811 * (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	7812 * 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	7813 * 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	7814 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7815 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	7816 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7817 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	7818 HPIXMAP pixmap;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	7819 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	7820 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	7821 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	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 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	7824 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	7825
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 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	7827
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 /* 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	7829 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	7830 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7831 /* 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	7832 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	7833 {
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 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	7835 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	7836 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	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 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	7839 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	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 }
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 ( 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	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 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	7845 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	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 }
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
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 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	7850 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	7851 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	7852 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	7853 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	7854 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	7855 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7856 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	7857 }
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 /*
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 * 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	7861 * Parameters:
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 * 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	7863 * 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	7864 * 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	7865 * (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	7866 * 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	7867 * 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	7868 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7869 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	7870 {
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	7871 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	7872 HPIXMAP pixmap;
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7873 char template[] = "/tmp/dwpixmapXXXXXX";
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7874
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7875 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	7876 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	7877
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7878 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	7879 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7880 * 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	7881 * 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	7882 */
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	7883 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	7884 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	7885 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	7886 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	7887 }
2201 ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2200 diff changeset	7888 /* 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	7889 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	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 DW_MUTEX_UNLOCK;
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 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	7893 }
2200 319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2199 diff changeset	7894 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	7895 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	7896 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	7897 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	7898 /* 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	7899 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	7900 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	7901 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	7907 * Parameters:
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 * 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	7909 * 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	7910 * 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	7911 * 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	7912 * 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	7913 */
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 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	7915 {
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 /*
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 * 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	7920 * Parameters:
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 * 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	7922 * 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	7923 * 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	7924 * 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	7925 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7926 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	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 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	7929 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	7930
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 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	7932 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	7933
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
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 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	7936 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	7937 DW_MUTEX_UNLOCK;
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 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	7939 }
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 /* 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	7942 * 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	7943 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7944 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	7945 {
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
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 /*
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7949 * 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	7950 * 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	7951 * 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	7952 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7953 * 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	7954 * 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	7955 * 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	7956 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7957 * 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	7958 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	7959 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	7960 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7961 if(pixmap && fontname && *fontname)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7962 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7963 char *oldfont = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7964 pixmap->font = strdup(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	7965 _convert_font(pixmap->font);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7966 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7967 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7968 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7969 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7970 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7971 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7972
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7973 /*
775 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 * 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	7975 * Parameters:
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: 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	7977 * 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	7978 */
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 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	7980 {
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 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	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 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	7984 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	7985 cairo_surface_destroy(pixmap->image);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7986 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7987 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	7988 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	7989 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7991
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7992 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7993 * 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	7994 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7995 * 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	7996 * 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	7997 * 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	7998 * 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	7999 * 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	8000 * 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	8001 * 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	8002 * 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	8003 * 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	8004 * 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	8005 */
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8006 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	8007 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8008 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	8009 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8010
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8011 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8012 * 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	8013 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8014 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8015 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8016 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8017 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8018 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8019 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8020 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8021 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8022 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8023 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8024 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8025 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8026 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8027 * 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	8028 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8029 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	8030 {
775 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 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	8032 cairo_t *cr = NULL;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8033 int retval = DW_ERROR_GENERAL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8034 #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	8035 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	8036 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8037 #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	8038
1177 c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1161 diff changeset	8039 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	8040 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	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 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	8043 if(dest)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8044 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8045 GdkWindow *window = gtk_widget_get_window(dest);
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8046 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8047 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8048 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8049 DW_MUTEX_UNLOCK;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8050 return retval;
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8051 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8052 #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	8053 clip = gdk_window_get_clip_region(window);
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	8054 dc = gdk_window_begin_draw_frame(window, clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8055 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	8056 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8057 cr = gdk_cairo_create(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	8058 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	8059 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8060 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	8061 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	8062
775 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 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	8064 {
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8065 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	8066
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8067 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8068 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8069 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8070 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8071 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8072 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8073
775 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 if(src)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8075 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	8076 else if(srcp)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8077 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	8078
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8079 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	8080 cairo_fill(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8081 #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	8082 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	8083 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8084 /* 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	8085 * 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	8086 */
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	8087 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	8088 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	8089 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8090 #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	8091 cairo_destroy(cr);
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8092 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8093 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8094 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8095 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	8096 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8098 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8099 * 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	8100 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8101 * 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	8102 * 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	8103 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8104 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	8105 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8106 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	8107
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8108 DW_MUTEX_LOCK;
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	8109 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	8110 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8111 }
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
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 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	8114 {
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 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	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 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	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 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	8120 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	8121 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8123
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 /* 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	8125 * Parameters:
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 * 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	8127 * 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	8128 * 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	8129 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8130 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	8131 {
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 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	8133 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	8134 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	8135
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8136
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 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	8138 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	8139
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 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	8141 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	8142
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 /* 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	8144 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	8145
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8146 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	8147 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	8148
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 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	8150 _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	8151
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 *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	8153 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	8154 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 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	8156 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	8157 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	8158 *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	8159 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8160
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8161 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	8162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8163 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	8164 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8165
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8166 /* 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	8167 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8168 * 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	8169 * 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	8170 * 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	8171 * 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	8172 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8173 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	8174 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8175 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	8176 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	8177
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8178 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	8179 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	8180
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 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	8182 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	8183 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8184
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8185 /* 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	8186 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8187 * 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	8188 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 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	8190 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 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	8192 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	8193 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	8194 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8195
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8197 * 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	8198 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8199 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	8200 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8201 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	8202
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8203 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	8204 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	8205 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8206
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8207 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 * 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	8209 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8210 * 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	8211 */
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 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	8213 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8214 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	8215 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 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	8217 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	8218 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8219 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8222 * 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	8223 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8224 * 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	8225 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8226 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	8227 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228 /* 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	8229 * 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	8230 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8231 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	8232 _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	8233
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8234 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	8235
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8236 /* 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	8237 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	8238 _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	8239 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8241 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8242 * 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	8243 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8244 * 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	8245 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8246 * 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	8247 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8248 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	8249 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8250 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	8251 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	8252 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	8253 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8254
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8255 /*
775 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 * 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	8257 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8258 * 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	8259 */
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 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	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 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	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
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 * 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	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 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	8269 {
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 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	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 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	8273 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	8274
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 /* 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	8276 * 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	8277 * 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	8278 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8279 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	8280 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	8281 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	8282
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8283 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	8284 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	8285 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	8286
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8287 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	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
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 /*
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 * 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	8292 * Parameters:
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 * 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	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 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	8296 {
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 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	8298 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	8299
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 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	8301 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	8302 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	8303 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	8304 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	8305 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	8306 }
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
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 * 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	8310 * 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	8311 * Parameters:
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 * 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	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 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	8315 {
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 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	8317 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	8318
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 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	8320 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	8321 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	8322 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	8323 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	8324 }
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
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 * 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	8328 * 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	8329 * Parameters:
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 * 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	8331 */
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 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	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 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	8335
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 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	8337 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	8338
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8339 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	8340
775 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 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	8342 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8343 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	8344 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	8345 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8346
1156 03b6d9fdfac0 Fixed a typo on Unix... timeout not time. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	8347 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	8348 {
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	8349 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	8350 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	8351
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	8352 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	8353 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	8354 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	8355 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	8356 }
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	8357 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	8358 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	8359
775 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 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	8361 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	8362 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	8363 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	8364 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	8365 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	8366 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367
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 * 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	8370 * Parameters:
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 * 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	8372 */
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 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	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 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	8376 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	8377
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 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	8379 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	8380 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	8381 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	8382 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	8383 *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	8384
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	8385 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	8386 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387
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 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	8389 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	8390 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	8391 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8392
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8393 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	8394 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8395 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	8396 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	8397 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	8398 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	8399 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	8400 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	8401
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8402 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	8403 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	8404
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 /* 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	8406 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	8407 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8408 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	8409 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	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
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 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	8413 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	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 /* 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	8416 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	8417
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 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	8419 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8420 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	8421 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	8422 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	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 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	8425
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 /* 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	8427 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	8428 {
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 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	8430 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	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 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	8433 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434
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 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	8436 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8437 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	8438 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	8439 }
775 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
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 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	8442 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 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	8444 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	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(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	8447 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8448 /* 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	8449 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	8450 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	8451
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 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	8453 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	8454
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8455 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	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 /* 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	8458 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	8459 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	8460 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8461 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462
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 /* 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	8464 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	8465 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466 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	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 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	8469 {
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 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	8471
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8472 /* 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	8473 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	8474 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	8475 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	8476 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	8477 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8478 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	8479 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	8480 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	8481 }
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 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	8483
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 /* 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	8485 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	8486 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	8487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 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	8489 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8490 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	8491 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8492 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	8493 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8494 /* 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	8495 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	8496 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8497 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	8498 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	8499 /* 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	8500 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8501 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	8502 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	8503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8504 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	8505
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8506 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	8507 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8508 /* 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	8509 * 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	8510 * 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	8511 */
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(array[s].waiting)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8513 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	8514 }
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 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	8517 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	8518 /* 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	8519 {
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 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	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 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	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 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	8525 if(posted)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8526 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	8527 }
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 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	8529 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	8530 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8531 /* 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	8532 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	8533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8534 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	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 }
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 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8539 }
775 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 /* 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	8543 /* 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	8544 * 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	8545 * Parameters:
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 * 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	8547 * 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	8548 * 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	8549 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8550 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	8551 {
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 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	8553 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	8554 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	8555
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8556 if(!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	8557 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	8558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8559 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	8560 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	8561 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	8562 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	8563 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	8564 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	8565 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	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 /* 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	8568 * 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	8569 */
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 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	8571
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 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	8573 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	8574 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	8575 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	8576
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 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	8578 {
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 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	8580 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	8581 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	8582 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	8583 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	8584 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	8585 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	8586 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	8587 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8588
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 /* 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	8590 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	8591 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	8592 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593
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 /* 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	8595 * Parameters:
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 * 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	8597 * 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	8598 * 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	8599 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8600 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	8601 {
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 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	8603 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	8604 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	8605 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	8606
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 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	8608 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	8609 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	8610 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	8611 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	8612 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	8613 }
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 /* 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	8616 * 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	8617 * Parameters:
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 * 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	8619 * 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	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 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	8622 {
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 /* 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	8624 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	8625
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8626 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8627 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8628
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8629 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	8630 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8631 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	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
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 /* 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	8635 * 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	8636 * Parameters:
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 * 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	8638 * 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	8639 */
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 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	8641 {
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 /* 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	8644 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	8645
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8646 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8647 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8648
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8649 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	8650 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8651 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	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
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 /* 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	8655 * 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	8656 * Parameters:
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 * 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	8658 * 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	8659 * 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	8660 * 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	8661 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8662 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	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 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	8665 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	8666 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	8667 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	8668
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8669 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	8670 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	8671
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 /* 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	8673 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	8674 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8675 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	8676 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	8677
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 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	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
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 FD_ZERO(&rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8682 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	8683
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 /* 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	8685 tmp = (char)2;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8686 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	8687
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8688 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8689 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	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 /* 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	8692 tmp = (char)3;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8693 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8694 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	8695
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 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	8697 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	8698 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	8699 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	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 /* 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	8702 * 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	8703 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8704 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	8705 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8706 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	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
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 /* 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	8710 * 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	8711 * Parameters:
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 * 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	8713 * 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	8714 */
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 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	8716 {
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 /* 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	8718 * 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	8719 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8720 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8721 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	8722 }
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
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8724 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8725 * 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	8726 * 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	8727 * 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	8728 * 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	8729 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8730 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8731 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8732 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8733
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8734 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	8735 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	8736 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	8737 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8738
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8739 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8740 * 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	8741 * 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	8742 * 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	8743 * 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	8744 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8745 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8746 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8747 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	8748
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8749 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	8750 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8751 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	8752 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8753 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8754
775 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 * 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	8757 */
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 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	8759 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8760 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	8761 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	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 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	8764
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8765 /* Initialize colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8766 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8767
775 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 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	8769 free(tmp);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8770
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8771 /* Free colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8772 _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	8773 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8776 * 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	8777 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8778 * 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	8779 * 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	8780 * 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	8781 * 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	8782 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8783 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	8784 {
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	8785 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	8786 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	8787
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 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	8789 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	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 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	8792 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8793 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	8794 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	8795 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8797 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8798 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8799 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8800 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8801 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8802 }
775 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
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 /* 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	8805 *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	8806
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 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	8808 {
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 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	8810 *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	8811 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	8812 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	8813 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8814
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8815 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	8816 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	8817 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	8818
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 handle;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8822 /*
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 * 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	8824 * Parameters:
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 * 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	8826 * 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	8827 * 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	8828 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	8829 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	8830 {
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	8831 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	8832 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	8833
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 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	8835 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	8836
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8837 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	8838 {
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 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	8840 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	8841 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8842
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8843 /* 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	8844 *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	8845
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 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	8847 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8848 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	8849 *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	8850 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	8851 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	8852 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8854 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	8855 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	8856 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	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 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	8859 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8861 /*
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 * 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	8863 * Parameters:
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 * 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	8865 * 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	8866 */
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 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	8868 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8869 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	8870 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	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 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	8873 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	8874 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8875 /* 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	8876 * 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	8877 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8878 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	8879 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	8880 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	8881 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8882 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	8883 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8884 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8885 * 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	8886 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8887 * 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	8888 * 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	8889 * 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	8890 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8891 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	8892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8893 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	8894 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	8895 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	8896
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8897 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	8898 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	8899
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8900 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	8901 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	8902 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	8903 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	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
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 * 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	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 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	8910 {
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 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	8912 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8913
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8914 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8915 * 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	8916 */
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 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	8918 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8919 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	8920 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8921
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 * 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	8924 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8925 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	8926 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8927 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8928
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8929 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8930 * 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	8931 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8932 * 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	8933 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8934 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	8935 {
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 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	8937 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8938
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	8939 /* 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	8940 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	8941 {
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	8942 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	8943
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	8944 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	8945
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	8946 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	8947 {
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	8948 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	8949 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	8950 /* 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	8951 *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	8952 *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	8953 }
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	8954 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	8955 {
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	8956 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	8957 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	8958 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	8959 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	8960 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	8961 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	8962
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	8963 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	8964
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	8965 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	8966
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	8967 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	8968 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	8969 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	8970 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	8971
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	8972 /* 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	8973 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	8974 {
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	8975 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	8976 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	8977 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	8978 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	8979 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	8980 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	8981
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	8982 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	8983 {
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	8984 *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	8985 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	8986 }
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	8987 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	8988 {
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	8989 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	8990 {
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	8991 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	8992 {
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	8993 *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	8994 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	8995 }
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	8996 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	8997 *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	8998 }
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	8999 }
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	9000 *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	9001 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	9002 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	9003 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	9004 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	9005 }
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	9006 if(hscrolled)
1563 90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1562 diff changeset	9007 *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	9008 }
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	9009 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	9010 {
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	9011 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	9012 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	9013
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	9014 *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	9015 *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	9016 }
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	9017 }
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	9018 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	9019 *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	9020 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	9021 *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	9022 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	9023 *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	9024 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	9025 *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	9026 }
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	9027
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9028 /* 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	9029 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	9030 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9031 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	9032 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	9033
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9034 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	9035 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	9036
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9037 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9038 * 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	9039 * 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	9040 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9041 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	9042 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9043 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	9044 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	9045 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9046
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9047 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	9048
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9049 /* 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	9050 * 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	9051 */
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	9052 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	9053 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	9054
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9055 /* 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	9056 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	9057 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9058 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	9059 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	9060 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	9061 }
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9062 /* 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	9063 * 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	9064 */
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	9065 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	9066 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9067 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	9068
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	9069 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	9070 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9071 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	9072 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	9073
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	9074 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	9075 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	9076 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	9077 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	9078
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9079 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	9080 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	9081 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	9082 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9083 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9084
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9085 /* 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	9086 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	9087
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9088 /* 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	9089 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	9090 {
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	9091 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	9092 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	9093
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9094 /* 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	9095 * 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	9096 * 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	9097 * 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	9098 */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9099 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	9100 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9101 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	9102
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9103 /* 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	9104 * 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	9105 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9106 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	9107
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9108 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	9109 {
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	9110 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	9111 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	9112 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	9113 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	9114 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9115 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9116 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	9117 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9118 /* 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	9119 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	9120 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9121
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9122 /* 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	9123 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	9124 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	9125 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	9126 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	9127
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9128 #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	9129 /* 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	9130 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	9131 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9132 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	9133
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9134 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	9135 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9136 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	9137 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	9138 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9139 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9140 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	9141 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9142 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	9143
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9144 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	9145 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9146 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	9147 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	9148 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9149 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9150 #endif
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9151
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9152 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	9153 /* 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	9154 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	9155 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	9156 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	9157 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	9158 /* 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	9159 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	9160 /* 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	9161 * 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	9162 */
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	9163 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	9164 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9165 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	9166 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	9167 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9168 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	9169 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9170 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	9171 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	9172 }
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	9173 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	9174 /* 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	9175 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	9176 {
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	9177 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	9178
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	9179 /* 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	9180 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	9181 _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	9182
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9183 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	9184 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	9185 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	9186 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	9187 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	9188 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	9189 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	9190 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	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 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	9193 {
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9194 /* 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	9195 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	9196 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	9197 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	9198 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	9199 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	9200 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	9201 }
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	9202 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	9203 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9204 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	9205 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	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 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	9208 {
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 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	9210 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	9211 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9212 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	9213 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	9214 }
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	9215 /* 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	9216 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	9217 {
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	9218 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	9219 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	9220 }
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	9221 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9222 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	9223
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9224 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	9225 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9226 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	9227 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	9228 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	9229 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	9230 }
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 /*
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	9234 * 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	9235 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9236 * 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	9237 * 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	9238 * 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	9239 */
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	9240 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	9241 {
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	9242 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	9243
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	9244 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	9245 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	9246 {
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	9247 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	9248 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	9249
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	9250 /* 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	9251 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	9252 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	9253
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9254 /* 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	9255 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	9256 {
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	9257 /* 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	9258 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	9259 #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	9260 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	9261 #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	9262
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	9263 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	9264 {
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	9265 /* 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	9266 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	9267 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	9268 }
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	9269 /* 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	9270 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	9271 {
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	9272 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	9273 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	9274 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9275 /* 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	9276 #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	9277 /* 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	9278 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	9279 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9280 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	9281
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9282 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	9283 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9284 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	9285 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9286 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	9287 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9288 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9289 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9290 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9291 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9292 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9293 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	9294
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9295 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	9296 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9297 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	9298 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9299 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	9300 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9301 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9302 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9303 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9304 #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	9305 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	9306 #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	9307 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	9308 }
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	9309 }
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	9310 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	9311 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	9312 }
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	9313
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	9314 /*
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	9315 * 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	9316 * 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	9317 * 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	9318 * 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	9319 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9320 * 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	9321 */
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	9322 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	9323 {
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9324 int _locked_by_me = FALSE;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9325 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	9326
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9327 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	9328 /* 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	9329 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9330 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9331 /* 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	9332 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	9333 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	9334 #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	9335 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	9336 #else
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9337 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9338
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9339 /* 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	9340 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9341 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9342 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9343
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9344 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	9345 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9346 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	9347 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9348 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9349 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	9350 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9351 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9352 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9353 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9354
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9355 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	9356 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9357 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	9358 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9359 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9360 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	9361 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9362 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9363
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9364 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9365 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9366 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9367 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9368 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	9369 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9370 /* 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	9371 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	9372 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	9373 else if(item)
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9374 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9375 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	9376 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9377 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	9378 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	9379 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9380 /* 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	9381 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	9382 #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	9383 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	9384 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	9385 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9386 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	9387 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9388 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9389 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9390 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9391 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9392 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	9393 }
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
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 /*
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9396 * 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	9397 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9398 * 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	9399 * 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	9400 * 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	9401 * 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	9402 * 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	9403 * 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	9404 * 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	9405 * 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	9406 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9407 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	9408 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9409 _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	9410 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9411
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9412 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9413 * 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	9414 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9415 * 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	9416 * 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	9417 * 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	9418 * 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	9419 * 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	9420 * 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	9421 * 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	9422 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9423 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	9424 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9425 /* 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	9426 * 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	9427 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9428 _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	9429 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9430
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9431 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9432 * 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	9433 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9434 * 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	9435 * 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	9436 * 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	9437 * 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	9438 * 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	9439 * 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	9440 * 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	9441 */
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9442 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	9443 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9444 _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	9445 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9446
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9447
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9448 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	9449 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	9450 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	9451
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9452 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	9453 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9454 /* 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	9455 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	9456 extents_time = 0;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9457 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	9458 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9459
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9460 /* 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	9461 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	9462 {
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	9463 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	9464 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9465 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	9466 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	9467 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	9468 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	9469 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	9470 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	9471
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9472 if(!extents_atom)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9473 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	9474
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	9475 /* 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	9476 *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	9477 *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	9478
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9479 /* See if the current window manager supports _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	9480 if(gdk_x11_screen_supports_net_wm_hint(gdk_screen_get_default(), request_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	9481 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9482 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	9483 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	9484 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	9485 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	9486 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	9487 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9488 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9489 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	9490
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9491 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	9492 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	9493 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	9494 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	9495 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	9496
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9497 /* 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	9498 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	9499 (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	9500 &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	9501
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9502 /* 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	9503 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	9504
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	9505 /* 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	9506 time(&extents_time);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9507
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	9508 /* 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	9509 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9510 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9511 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9512 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9513 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9514 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	9515
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9516 /* 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	9517 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	9518 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9519
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	9520 /* 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	9521 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	9522 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	9523 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	9524 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	9525 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	9526 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	9527 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9528 *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	9529 *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	9530 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9531 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9532 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	9533 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	9534 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9535
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9536 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9537 * 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	9538 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9539 * 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	9540 * 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	9541 * 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	9542 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9543 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	9544 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9545 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	9546
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9547 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	9548 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	9549
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9550 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	9551 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	9552 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9553 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	9554 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	9555
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9556 /* 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	9557 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	9558 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9559 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9560 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	9561
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9562 /* 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	9563 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	9564 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	9565
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9566 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	9567 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	9568 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9569 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	9570 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	9571 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9572 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9573 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9574 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9575 /* 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	9576 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	9577 (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	9578 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9579 /* 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	9580 * 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	9581 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9582 _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	9583 /* 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	9584 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	9585 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	9586 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9587 /* 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	9588 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	9589 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	9590 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9591 /* 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	9592 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	9593 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9594 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	9595 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	9596 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9597 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9598 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	9599 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	9600 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9601 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9602
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9603 /*
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	9604 * 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	9605 * 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	9606 * 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	9607 * 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	9608 * 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	9609 */
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	9610 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	9611 {
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	9612 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	9613
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	9614 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	9615 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	9616 {
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	9617 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	9618
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	9619 _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	9620
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	9621 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	9622 *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	9623 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	9624 *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	9625 }
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	9626 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	9627 {
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	9628 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	9629 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	9630 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	9631 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	9632 }
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	9633 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	9634 }
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	9635
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9636 /* 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	9637 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9638 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9639 #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	9640 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9641 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	9642
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9643 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9644 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9645 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	9646
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9647 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9648 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9649 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9650 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9651 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9652 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9653 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9654 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9655 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	9656 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9657 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	9658 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9659 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9660
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	9661 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9662 * 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	9663 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9664 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	9665 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9666 int retval = 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9667 int _locked_by_me = FALSE;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9668
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9669 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9670 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	9671 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9672 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	9673 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9674
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9675 /* 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	9676 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9677 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9678 #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	9679 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9680 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	9681
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9682 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9683 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9684 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	9685
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9686 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9687 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9688 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9689 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9690 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9691 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9692 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9693 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9694 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	9695 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9696 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	9697 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9698 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9699
775 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 /*
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 * 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	9702 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9703 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	9704 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9705 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	9706 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	9707
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9708 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9709 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	9710 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9711 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	9712 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9713
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9714 /* 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	9715 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	9716 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9717 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	9718 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	9719 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	9720
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9721 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9722 #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	9723 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	9724 #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	9725 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	9726 #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	9727 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	9728 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9729 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	9730 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9731
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9732 /*
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9733 * 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	9734 * 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	9735 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9736 * 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	9737 * 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	9738 * 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	9739 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9740 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	9741 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9742 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	9743 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	9744 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9745
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9746 /*
775 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 * 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	9748 * Parameters:
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 * 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	9750 * 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	9751 * 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	9752 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9753 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	9754 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9755 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	9756 #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	9757 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9758 #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	9759
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9760 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9761 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	9762
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9763 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	9764 #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	9765 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	9766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9767 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	9768 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9769 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9770 #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	9771 {
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9772 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	9773
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9774 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	9775 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9776 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	9777 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	9778 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	9779 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	9780 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	9781 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	9782
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9783 /* 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	9784 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	9785 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9786 /* 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	9787 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	9788 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9789 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	9790 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	9791
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9792 /* 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	9793 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	9794
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	9795 /* 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	9796 * 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	9797 * 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	9798 */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9799 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	9800 (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	9801 {
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	9802 _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	9803 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	9804 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	9805 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9806 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	9807 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	9808 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9809 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9810 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9811 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9812 /* 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	9813 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	9814 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9815 /* 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	9816 * 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	9817 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9818 _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	9819 /* 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	9820 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	9821 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	9822 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9823 /* 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	9824 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	9825 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	9826 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	9827 /* 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	9828 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	9829 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	9830 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	9831 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9832 /* 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	9833 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	9834 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9835 /* 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	9836 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9837 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9838 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9839 /* 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	9840 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	9841 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9842 /* 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	9843 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	9844 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	9845 /* 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	9846 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	9847 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	9848 /* 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	9849 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	9850 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	9851 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	9852 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	9853
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9854 #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	9855 /* 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	9856 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	9857 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9858 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9859 #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	9860 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	9861
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9862 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9863 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9864 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	9865
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9866 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9867 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9868 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9869 #else
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9870 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	9871
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9872 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	9873 #endif
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9874 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	9875 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9876 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	9877 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9878 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	9879 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	9880 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9881 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	9882 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9883 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	9884 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9885 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	9886 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	9887 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9888 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9889 #endif
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9890 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9891 /* 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	9892 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	9893 }
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9894 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	9895 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	9896 }
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 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	9902 * Parameters:
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 * 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	9904 * 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	9905 * 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	9906 * 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	9907 * 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	9908 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9909 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	9910 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9911 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	9912 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	9913 }
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
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 * 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	9917 * Parameters:
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 * 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	9919 * 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	9920 * 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	9921 * 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	9922 * 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	9923 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9924 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	9925 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9926 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	9927 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	9928 #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	9929 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9930 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9931
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9932 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9933 #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	9934 /* 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	9935 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	9936 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9937 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	9938 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9939 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9940 #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	9941 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9942 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	9943
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9944 /* 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	9945 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	9946 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9947 /* 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	9948 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	9949 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9950 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	9951 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9952 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9953
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9954 /* 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	9955 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	9956 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	9957 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	9958 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	9959 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	9960 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9961 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9962 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	9963 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9964 /* 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	9965 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	9966 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	9967 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9968 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9969 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9970 /* 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	9971 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9972 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9973 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9974 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9975 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9976 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9977 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9978 *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	9979 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9980 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9981
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9982 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9983 * 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	9984 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9985 * 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	9986 * 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	9987 * 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	9988 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9989 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	9990 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991 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	9992 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	9993
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9994 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	9995 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	9996 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9997 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	9998 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	9999 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	10000 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10001 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	10002 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10003 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	10004 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	10005 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	10006 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10007 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	10008 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10009 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	10010 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10011 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	10012 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10013 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	10014 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10015 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	10016 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10017 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	10018 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10019 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10021 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	10022 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10023 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	10024 /* 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	10025 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	10026 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	10027 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	10028 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	10029 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	10030 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	10031 /* 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	10032 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	10033 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	10034 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	10035 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	10036 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	10037 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	10038 #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	10039 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	10040 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	10041 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	10042 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	10043 #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	10044 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	10045 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	10046 }
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	10047 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	10048 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10049 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	10050
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	10051 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	10052 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	10053
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10054 _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	10055 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	10056 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	10057 _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	10058 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10059 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	10060 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	10061 _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	10062 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	10063 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	10064 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	10065 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	10066 _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	10067 }
775 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 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	10073 * Parameters:
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 * 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	10075 * 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	10076 * 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	10077 */
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 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	10079 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10080 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	10081 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	10082 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	10083
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 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	10085 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	10086
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 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	10088 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10089 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	10090 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10091 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	10092 {
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	10093 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	10094 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	10095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10096 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	10097 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	10098
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	10099 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	10100 /* 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	10101 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	10102 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10103 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	10104 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10105 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10106 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10107 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10109 /* 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	10110 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	10111 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10113 /* 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	10114 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	10115 {
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 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	10117 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	10118
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10119 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	10120 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10121 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	10122 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10123 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	10124 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10125 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	10126 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	10127 }
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 }
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 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	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
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 /*
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 * 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	10135 * Parameters:
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 * 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	10137 * 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	10138 */
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 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	10140 {
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 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	10142 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	10143
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 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	10145 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	10146 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	10147 {
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 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	10149 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	10150 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	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 DW_MUTEX_UNLOCK;
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 }
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
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 * 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	10157 * Parameters:
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 * 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	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 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	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 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	10163 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	10164
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 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	10166 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	10167 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	10168 DW_MUTEX_UNLOCK;
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 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	10170 }
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 /*
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 * 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	10174 * Parameters:
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 * 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	10176 * 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	10177 */
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 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	10179 {
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 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	10181
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 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	10183 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	10184 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	10185 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	10186 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10187 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10188
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10189
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10190 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10191 * 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	10192 * Parameters:
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 * 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	10194 * 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	10195 * 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	10196 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10197 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	10198 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199 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	10200 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	10201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10202 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	10203 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	10204 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	10205 {
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	10206 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	10207 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	10208
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	10209 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	10210 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	10211 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	10212 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10213
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10214 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	10215 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10216 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	10217 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	10218 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	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 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	10225 * Parameters:
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 * 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	10227 * 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	10228 * 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	10229 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10230 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	10231 {
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 /* 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	10233 }
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
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 * 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	10237 * Parameters:
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 * 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	10239 * 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	10240 * 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	10241 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10242 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	10243 {
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 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	10245 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	10246 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	10247 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	10248
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	10249 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	10250 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	10251 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	10252 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	10253 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	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 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	10256 {
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 DW_MUTEX_UNLOCK;
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 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	10259 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10260
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 /* 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	10262 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	10263 {
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 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	10265 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10266 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	10267 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	10268 {
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 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	10270 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	10271 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	10272 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	10273 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	10274 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	10275 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10276 }
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 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	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 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	10282
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10283 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	10284 {
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	10285 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	10286 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	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
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 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	10290 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	10291 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	10292 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	10293 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	10294 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	10295 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	10300 * Parameters:
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 * 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	10302 * 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	10303 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10304 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	10305 {
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	10306 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	10307 }
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 /*
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 * 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	10311 * 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	10312 * Parameters:
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 * 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	10314 * 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	10315 * 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	10316 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10317 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	10318 {
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 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	10320 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	10321 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	10322
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10323 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	10324 /* 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	10325 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	10326 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10327 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	10328 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	10329 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	10330 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10331 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	10332 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10333 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10334
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	10335 /* 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	10336 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	10337 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	10338 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	10339 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	10340
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	10341 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	10342 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10343 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	10344 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	10345 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10346
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	10347 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	10348 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10349 /* 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	10350 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	10351 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10352 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	10353 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10354 /* 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	10355 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	10356 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10357 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	10358 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10359 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	10360 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10361
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10362 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10363 * 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	10364 * 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	10365 * 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	10366 * 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	10367 * 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	10368 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10369 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	10370 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10371 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	10372 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	10373 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	10374
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10375 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	10376 /* 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	10377 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	10378 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10379 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	10380 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	10381 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	10382 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10383 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	10384 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10385 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	10386 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10387
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	10388 /* 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	10389 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	10390 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	10391 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	10392 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	10393
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	10394 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	10395 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10396 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	10397 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	10398 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10399
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	10400 /* 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	10401 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	10402 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10403 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	10404 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	10405 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10406 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10407 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	10408 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10409
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10410 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10411 * 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	10412 * 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	10413 * 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	10414 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10415 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	10416 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10417 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	10418 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	10419 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	10420
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10421 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	10422 /* 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	10423 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	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 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	10426 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	10427 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	10428 }
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	10429 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	10430 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10431 /* 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	10432 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	10433 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	10434 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	10435 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	10436
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	10437 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	10438 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10439 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	10440 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	10441 }
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	10442 /* Clear the list */
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10443 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	10444 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10445 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10446 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10447
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10448 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10449 * 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	10450 * Parameters:
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 * 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	10452 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10453 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	10454 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10455 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	10456 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	10457 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	10458 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	10459
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10460 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	10461 /* 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	10462 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	10463 {
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 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	10465 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	10466 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	10467 }
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	10468 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	10469 {
99ce0ea1f271 Implemented many 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 /* 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	10471 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	10472 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	10473 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	10474 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	10475
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	10476 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	10477 {
99ce0ea1f271 Implemented many 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 /* 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	10479 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	10480 }
99ce0ea1f271 Implemented many 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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10482 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10483 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	10484 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10485
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10486 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10487 * 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	10488 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10489 * 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	10490 * 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	10491 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10492 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	10493 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10494 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	10495 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	10496
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10497 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	10498 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	10499 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10500 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	10501 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	10502 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	10503 }
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10504 /* 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	10505 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	10506 {
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10507 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	10508 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	10509
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10510 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10511 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10512 /* 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	10513 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	10514 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	10515 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	10516 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	10517 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	10518
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10519 /* Safety check */
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10520 if(rowcount < 2)
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10521 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10522 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10523 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10524 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10525
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10526 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10527 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10528 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10529 top = rowcount;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10530
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10531 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	10532
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10533 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	10534 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10535 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10536 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10537 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10538
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10539 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10540 * 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	10541 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10542 * 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	10543 * 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	10544 * 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	10545 * 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	10546 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10547 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	10548 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10549 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	10550 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	10551 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	10552
99ce0ea1f271 Implemented many 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 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	10554 /* 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	10555 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	10556 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557 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	10558 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	10559 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	10560 }
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	10561 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	10562 {
99ce0ea1f271 Implemented many 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 /* 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	10564 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	10565 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	10566 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	10567 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	10568
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10569 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	10570 {
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	10571 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10572
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10573 /* 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	10574 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	10575 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10576 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10577 gchar *text;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10578 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	10579 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10580 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10581 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	10582 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10583 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10584 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10585 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10586 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10587 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10588 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10589 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	10590 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10591 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10592
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10593 /*
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 * 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	10595 * Parameters:
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 * 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	10597 * 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	10598 * 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	10599 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	10600 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	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 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	10603 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	10604 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	10605
99ce0ea1f271 Implemented many 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 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	10607 /* 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	10608 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	10609 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 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	10611 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	10612 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	10613 }
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	10614 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	10615 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10616 /* 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	10617 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	10618 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	10619 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	10620 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	10621
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10622 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	10623 {
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	10624 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10625
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10626 /* 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	10627 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	10628 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10629 /* Update the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10630 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	10631 }
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	10632 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10633 }
775 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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	10639 * Parameters:
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 * 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	10641 * 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	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 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	10644 {
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	10645 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	10646 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	10647 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	10648 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	10649
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 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	10651 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	10652
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	10653 /* 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	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))
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	10655 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	10656
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	10657 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	10658 {
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	10659 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	10660 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	10661
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	10662 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	10663 {
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	10664 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	10665 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	10666
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	10667 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	10668 {
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	10669 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	10670
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	10671 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	10672 {
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	10673 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	10674 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	10675 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10676
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	10677 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	10678 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	10679 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10680
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	10681 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	10682 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	10683 }
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	10684 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10685 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	10686 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	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 /*
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 * 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	10691 * Parameters:
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 * 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	10693 */
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	10694 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	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 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	10697 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10698 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	10699 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	10700
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10701 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10702 /* 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	10703 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	10704 {
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 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	10706 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	10707 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	10708 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10709 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10710 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10711 /* 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	10712 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	10713 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	10714 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	10715 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	10716
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10717 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10718 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10719 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	10720 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10721 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	10722 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	10723 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	10724 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10725 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	10726 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	10727
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10728 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	10729 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10730 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	10731 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10732
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10733 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	10734 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	10735 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10736 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10737 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10738 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10739 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	10740 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10741
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	10742 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	10743 {
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	10744 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	10745 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	10746 {
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	10747 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	10748
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	10749 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	10750 {
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	10751 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	10752 }
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	10753 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	10754 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10755 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10756 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10757 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10758 }
775 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 DW_MUTEX_UNLOCK;
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 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	10761 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10763 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10764 * 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	10765 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10766 * 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	10767 * 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	10768 * 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	10769 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10770 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	10771 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10772 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	10773 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10774 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	10775
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10776 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10777 /* 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	10778 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	10779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10780 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	10781 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	10782 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	10783 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10784 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10785 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10786 /* 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	10787 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	10788 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	10789 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	10790 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	10791
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10792 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	10793 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10794 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10795
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10796 /* 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	10797 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	10798 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10799 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	10800 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10801 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	10802 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10803 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10804 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10805 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	10806 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10807 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10808 /* 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	10809 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	10810 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10811 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10812 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10813 /* 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	10814 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	10815 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10816 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10817 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10818 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10819 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10820 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10821 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10822
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10823 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10824 * 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	10825 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10826 * 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	10827 * 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	10828 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10829 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	10830 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10831 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	10832 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	10833 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	10834
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10835 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	10836 /* 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	10837 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	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 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	10840 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	10841 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	10842 }
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	10843 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	10844 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10845 /* 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	10846 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	10847 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	10848 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	10849 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	10850
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	10851 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	10852 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10853 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10854
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10855 /* 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	10856 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	10857 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10858 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	10859 }
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	10860 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10861 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10862 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10863 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864
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	10865 /* 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	10866 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	10867 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10868 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	10869 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	10870
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10871 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	10872 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10873 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	10874
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	10875 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	10876
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10877 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	10878 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	10879 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	10880 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	10881 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	10882 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	10883 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10884 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	10885 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10886
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10887 /* 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	10888 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	10889 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10890 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	10891
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10892 /* 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	10893 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	10894 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	10895
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	10896 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	10897 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	10898 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10899
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10900 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10901 * 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	10902 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10903 * 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	10904 * 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	10905 * 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	10906 * 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	10907 * 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	10908 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10909 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	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 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	10912 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	10913 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	10914
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 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	10916 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	10917 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	10918 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	10919 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	10920 *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	10921 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	10922 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	10923 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	10924 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10925 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	10926 }
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
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 * 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	10930 * Parameters:
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 * 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	10932 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10933 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	10934 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10935 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	10936 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	10937
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10938 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	10939 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	10940 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	10941 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	10942
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10943 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	10944 *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	10945
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10946 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	10947 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948 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	10949
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10950 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	10951 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10953
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10954 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10955 * 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	10956 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10957 * 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	10958 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10959 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	10960 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10961 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	10962
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10963 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	10964 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	10965 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	10966 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10967
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10968 /*
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 * 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	10970 * Parameters:
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 * 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	10972 * 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	10973 * 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	10974 */
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 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	10976 {
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 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	10978 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	10979 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	10980 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	10981 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	10982
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10983 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	10984 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	10985 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	10986 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	10987 /* 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	10988 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	10989 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	10990 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	10991 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	10992 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	10993 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	10994
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10995 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10996 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	10997 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10998
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10999 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11000 * 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	11001 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11002 * 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	11003 * 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	11004 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11005 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	11006 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11007 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	11008
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11009 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	11010 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	11011 {
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 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	11013 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	11014 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11015 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11016 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	11017 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11018
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11019 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11020 * 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	11021 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11022 * 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	11023 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11024 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	11025 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11026 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	11027
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11028 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	11029 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	11030 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11031 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	11032 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	11033 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11034 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11035 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	11036 }
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
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 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11039 * 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	11040 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11041 * 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	11042 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11043 * 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	11044 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11045 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	11046 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11047 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	11048
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11049 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11050 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11051
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11052 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	11053 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	11054 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	11055 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11056
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11057 /*
775 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 * 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	11059 * Parameters:
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 * 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	11061 * 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	11062 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	11063 * 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	11064 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11065 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	11066 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11067 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	11068
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 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	11070 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	11071
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 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	11073 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	11074 DW_MUTEX_UNLOCK;
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 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	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 * 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	11081 * 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	11082 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11083 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	11084 {
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 _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	11086
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11087 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	11088 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	11089
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11090 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	11091 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	11092 DW_MUTEX_UNLOCK;
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 }
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
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11095
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11096 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11097 * 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	11098 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11099 * 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	11100 * 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	11101 * 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	11102 * 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	11103 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11104 * 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	11105 * 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	11106 * Remarks:
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11107 * 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	11108 * 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	11109 */
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	11110 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	11111 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11112 #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	11113 GNotification *notification = g_notification_new(title);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11114
2066 2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11115 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11116 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11117 if(description)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11118 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11119 va_list args;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11120 char outbuf[1025] = {0};
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11121
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11122 va_start(args, description);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11123 vsnprintf(outbuf, 1024, description, args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11124 va_end(args);
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11125
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11126 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	11127 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11128 #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	11129 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	11130 {
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	11131 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	11132 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	11133
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	11134 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	11135 {
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2115 diff changeset	11136 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	11137
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	11138 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	11139 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	11140 }
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	11141 }
2209 0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2208 diff changeset	11142 #endif
2133 2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2132 diff changeset	11143 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	11144 (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	11145 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11146 return (HWND)notification;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11147 #else
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11148 return NULL;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11149 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11150 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11151
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11152 /*
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11153 * 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	11154 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11155 * 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	11156 * Returns:
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11157 * 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	11158 */
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11159 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	11160 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11161 #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	11162 if(notification)
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11163 {
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11164 char id[101] = {0};
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11165
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11166 /* 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	11167 * 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	11168 */
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	11169 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	11170 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	11171 return DW_ERROR_NONE;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11172 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11173 #endif
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11174 return DW_ERROR_UNKNOWN;
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11175 }
2c2530f8cbef Initial design for system notification support on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2063 diff changeset	11176
775 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 /*
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 * 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	11179 * Parameters:
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 * 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	11181 */
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 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	11183 {
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 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	11185 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	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 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	11188 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	11189 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	11190 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	11191
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11192 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	11193 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
2081 24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11194 #ifdef USE_WEBKIT
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11195 # ifdef USE_WEBKIT2
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11196 strncpy(env->htmlEngine, "WEBKIT2", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11197 # else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11198 strncpy(env->htmlEngine, "WEBKIT", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11199 # endif
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11200 #else
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11201 strncpy(env->htmlEngine, "N/A", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2071 diff changeset	11202 #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	11203 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	11204 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	11205 #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	11206 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	11207 #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	11208 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	11209 #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	11210
2063 f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11211 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	11212 {
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11213 *dot = '\0';
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2057 diff changeset	11214 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	11215 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	11216 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	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 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	11219 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11221 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 * 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	11223 * Parameters:
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 * 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	11225 * 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	11226 * 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	11227 * 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	11228 * 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	11229 * 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	11230 * 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	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 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11233 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	11234 {
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 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	11236
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 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	11238 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	11239 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	11240 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	11241 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	11242 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	11243 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	11244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245 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	11246 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11247 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	11248 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	11249 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	11250 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	11251 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	11252 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	11253 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	11254 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	11255 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	11256 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	11257 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	11258 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	11259 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	11260 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	11261 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	11262 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	11263 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11265 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	11266 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	11267 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	11268 _("_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	11269 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	11270 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	11271
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11272 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	11273 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	11274
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11275 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	11276 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11277 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	11278 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	11279 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	11280 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	11281 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	11282 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	11283 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	11284 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	11285 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	11286 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	11287 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11288
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 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	11290 {
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11291 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	11292
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	11293 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	11294 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11295 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	11296 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11297
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11298 /* See if the path exists */
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11299 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11300 {
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11301 /* 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	11302 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11303 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	11304 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	11305 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	11306 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11307 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	11308 }
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11309 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11310 {
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	11311 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	11312 {
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	11313 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	11314
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	11315 /* 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	11316 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	11317 {
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	11318 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	11319 }
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	11320 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	11321 {
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	11322 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	11323 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	11324
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	11325 /* 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	11326 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	11327 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	11328
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	11329 /* 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	11330 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	11331 {
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	11332 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	11333 {
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	11334 /* 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	11335 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	11336 }
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	11337 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11338
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	11339 /* 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	11340 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	11341 /* ... 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	11342 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	11343 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	11344 }
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	11345 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11346 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11347 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11349 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	11350 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11351 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	11352 /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	11353 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11354
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11355 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	11356 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	11357 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11358
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11361 * 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	11362 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11363 * 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	11364 * 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	11365 * 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	11366 * 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	11367 * -1 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	11368 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11369 int dw_exec(const char program, int type, char *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	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 int 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	11372
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 if((ret = fork()) == 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	11374 {
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 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	11376
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 for (i = 3; i < 256; 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	11378 close(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	11379 setsid();
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 if(type == 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	11381 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11382 execvp(program, params);
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 else if(type == DW_EXEC_CON)
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 char **tmpargs;
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
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 if(!params)
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 {
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 tmpargs = malloc(sizeof(char *));
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 tmpargs[0] = 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	11392 }
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 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	11394 {
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 int z = 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	11396
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 while(params[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	11398 {
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 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	11400 }
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 tmpargs = malloc(sizeof(char )(z+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	11402 z=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	11403 tmpargs[0] = "xterm";
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 tmpargs[1] = "-e";
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 while(params[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	11406 {
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 tmpargs[z+2] = params[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	11408 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	11409 }
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 tmpargs[z+2] = 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 }
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 execvp("xterm", tmpargs);
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 free(tmpargs);
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 }
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 /* If we got here exec 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	11416 _exit(-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	11417 }
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 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	11419 }
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 /*
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 * 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	11423 * Parameters:
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 * 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	11425 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11426 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	11427 {
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11428 /* 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	11429 #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	11430 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	11431 #else
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11432 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	11433 #endif
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11434 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11435 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	11436 }
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11437 else
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11438 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11439 /* 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	11440 * 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	11441 */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11442 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	11443
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11444 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	11445 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	11446 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	11447 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	11448 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11449
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11450 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	11451 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11452 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11453
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11454 #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	11455 /* 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	11456 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	11457 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11458 if(widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11459 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11460 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	11461 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	11462 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11463 #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	11464 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	11465 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	11466 return web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11467 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11468 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11469 return NULL;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11470 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11471 #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	11472 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11473 * 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	11474 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11475 * 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	11476 * 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	11477 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11478 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	11479 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11480 #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	11481 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	11482 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	11483
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11484 DW_MUTEX_LOCK;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11485
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11486 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	11487 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11488 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	11489 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11490 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	11491 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	11492 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	11493 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	11494 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	11495 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	11496 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	11497 #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	11498 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	11499 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11500 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	11501 #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	11502 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	11503 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	11504 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	11505 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	11506 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	11507 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	11508 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	11509 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	11510 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11511 #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	11512 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	11513 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	11514 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	11515 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11516 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	11517 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	11518 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11519 }
775 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 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	11521 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11522 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11523 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11524 #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	11525 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11526
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11527 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11528 * 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	11529 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11530 * 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	11531 * 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	11532 * 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	11533 * 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	11534 * 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	11535 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11536 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	11537 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11538 #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	11539 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	11540 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	11541
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11542 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	11543 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	11544 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11545 #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	11546 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	11547 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11548 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	11549 #endif
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11550 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	11551 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11552 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	11553 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	11554 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11555 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	11556 #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	11557 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11559 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11560 * 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	11561 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11562 * 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	11563 * 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	11564 * 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	11565 * 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	11566 * 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	11567 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11568 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	11569 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11570 #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	11571 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	11572 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	11573
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11574 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	11575 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	11576 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11577 #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	11578 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	11579 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11580 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	11581 #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	11582 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	11583 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11584 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	11585 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	11586 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11587 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	11588 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11589 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11590
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11591 /*
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11592 * 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	11593 * Parameters:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11594 * 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	11595 * 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	11596 * 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	11597 * 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	11598 * Returns:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11599 * 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	11600 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11601 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	11602 {
2007 3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11603 #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	11604 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	11605 WebKitWebView *web_view;
2040 2c56a8e245e8 Move saved_thread so it compiles on non-webkit2 mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2036 diff changeset	11606
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11607 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	11608 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	11609 #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	11610 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	11611 #else
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2006 diff changeset	11612 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	11613 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11614 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	11615 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	11616 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11617 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	11618 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11619 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	11620
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11621 #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	11622 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	11623 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11624 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	11625 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	11626
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11627 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	11628 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	11629 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11630
775 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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11632 * 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	11633 * 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	11634 * 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	11635 */
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11636 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	11637 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11638 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	11639
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11640 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	11641 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	11642 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	11643 }
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 #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	11645
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11646 /*
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11647 * 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	11648 * 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	11649 * 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	11650 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11651 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	11652 {
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	11653 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	11654 #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	11655 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	11656 WebKitWebView *web_view;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11657 #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	11658 WebKitSettings *settings;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11659 #else
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11660 WebKitWebSettings *settings;
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11661 #endif
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 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	11664 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	11665 /* 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	11666 * 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	11667 */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11668 #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	11669 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	11670 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	11671 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	11672 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	11673 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	11674 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	11675 /* 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	11676 settings = webkit_web_settings_new();
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11677 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	11678 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	11679 #else
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	11680 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	11681 /* 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	11682 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	11683 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	11684 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	11685 #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	11686 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	11687 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	11688 #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	11689 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	11690 #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	11691 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	11692 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11694 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11695 * 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	11696 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11697 * 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	11698 * 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	11699 * 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	11700 * 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	11701 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11702 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	11703 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11704 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11705 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11706 char *ret = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11707
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11708 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11709 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	11710 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11711 gchar *clipboard_contents;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11712
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11713 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	11714 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11715 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11716 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11717 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11718 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11719 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11720 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	11721 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11722
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 /*
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 * 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	11725 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11726 * 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	11727 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11728 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	11729 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11730 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11731 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11732
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11733 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11734 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	11735 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11736 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	11737 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11738 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11739 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11740
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11741 /* 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	11742 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	11743 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11744 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	11745 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	11746 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	11747 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11748 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11749
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11750 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	11751 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11752 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	11753 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11754 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	11755 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	11756 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	11757 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11758 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	11759 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11760 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11761 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11762
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11763 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11764 * 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	11765 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11766 * 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	11767 * 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	11768 * 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	11769 * 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	11770 * 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	11771 * Returns:
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1136 diff changeset	11772 * 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	11773 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11774 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	11775 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11776 GtkPrintOperation *op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11777 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	11778
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11779 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11780 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11781
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11782 DW_MUTEX_LOCK;
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11783 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	11784 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11785 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	11786 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	11787 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	11788 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	11789 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	11790 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11791 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11792 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11793 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11794
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11795 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11796 * 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	11797 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11798 * 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	11799 * 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	11800 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11801 * 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	11802 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11803 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	11804 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11805 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11806 GtkPrintOperation op = (GtkPrintOperation )print;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11807 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	11808
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11809 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11810 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	11811 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11812 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	11813 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11814
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11815 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11816 * 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	11817 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11818 * 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	11819 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11820 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	11821 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11822 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	11823 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	11824
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11825 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11826 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	11827 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11828 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11829
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11830 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11831 * 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	11832 * 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	11833 * 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	11834 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11835 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	11836 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11837 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	11838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11839 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	11840 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11841 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	11842
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 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	11844 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	11845 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	11846 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	11847 }
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 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	11849 }
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
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 /*
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11852 * 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	11853 * 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	11854 */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11855 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	11856 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11857 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11858 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11859
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11860 /*
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	11861 * 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	11862 * 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	11863 * 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	11864 * 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	11865 * 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	11866 * 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	11867 * 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	11868 * 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	11869 * 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	11870 * 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	11871 * 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	11872 * 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	11873 * 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	11874 * 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	11875 */
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2081 diff changeset	11876 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	11877 {
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	11878 #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	11879 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	11880 {
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	11881 strncpy(_dw_app_id, appid, _DW_APP_ID_SIZE);
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	11882 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	11883 }
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	11884 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	11885 #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	11886 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	11887 #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	11888 }
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	11889
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	11890 /*
775 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 * 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	11892 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11893 * 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	11894 * 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	11895 * 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	11896 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11897 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	11898 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11899 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	11900
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11901 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	11902
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11903 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	11904 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	11905 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11906
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11907 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11908 * 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	11909 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11910 * 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	11911 * 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	11912 * 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	11913 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11914 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	11915 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11916 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	11917 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	11918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11919 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	11920 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	11921
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11922 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	11923 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	11924 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11925 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	11926 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11927 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11928 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	11929 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11930 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11931
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11932 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11933 * 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	11934 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11935 * 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	11936 * 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	11937 * 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	11938 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	11939 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	11940 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11941 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	11942 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	11943 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	11944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11945 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	11946 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	11947
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11948 DW_MUTEX_LOCK;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11949 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11950 {
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11951 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	11952 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11953 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11954 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	11955 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11956 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	11957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11958
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	11959 /* 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	11960 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	11961 {
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	11962 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	11963 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	11964 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	11965 int *tag = data;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11966
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	11967 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	11968 {
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	11969 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	11970 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	11971 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	11972 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	11973 }
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	11974 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	11975 {
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	11976 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	11977 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	11978 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	11979 }
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	11980 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	11981 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	11982 }
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	11983
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11984 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11985 * 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	11986 * Parameters:
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 * 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	11988 * 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	11989 * 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	11990 * 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	11991 * 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	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 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	11994 {
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	11995 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	11996 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	11997
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	11998 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	11999
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	12000 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	12001 *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	12002 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	12003 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	12004 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	12005 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	12006 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	12007 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	12008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12009
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12010 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12011 * 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	12012 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12013 * 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	12014 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12015 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	12016 {
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	12017 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	12018 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	12019
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	12020 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	12021 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	12022 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	12023 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	12024 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	12025 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	12026 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12027
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12028 /* 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	12029 * 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	12030 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12031 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	12032 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12033 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	12034
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12035 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	12036 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	12037 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	12038 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	12039 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	12040 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	12041 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	12042 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12043
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12044 /*
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 * 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	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 * 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	12048 * 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	12049 * 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	12050 * 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	12051 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12052 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	12053 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12054 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	12055 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12056
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12057 /* 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	12058 * 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	12059 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12060 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	12061 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12062 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12063 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12064 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12065 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	12066
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12067 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12068 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12069 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	12070
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12071 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12072 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12073 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	12074 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12075 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12076 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12077 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12078 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12079
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12080 #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	12081
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12082 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12083 * 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	12084 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12085 * 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	12086 * 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	12087 * 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	12088 * 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	12089 * 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	12090 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12091 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	12092 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12093 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	12094 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	12095 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	12096 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	12097 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	12098 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	12099
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12100 /* 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	12101 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	12102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12103 DW_MUTEX_LOCK;
2112 b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12104 #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	12105 /* 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	12106 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	12107 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12108 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	12109 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	12110 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	12111 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	12112 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	12113 DW_MUTEX_UNLOCK;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12114 return;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12115 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2091 diff changeset	12116 #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	12117 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12118 * 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	12119 * 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	12120 */
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12121 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	12122 #ifdef USE_WEBKIT
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12123 && !(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	12124 #endif
74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12125 )
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12126 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12127 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	12128 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12129
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12130 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	12131 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12132 thisname = "draw";
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12133 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12134 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	12135 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12136 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	12137 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	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 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	12140 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12141 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	12142 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	12143 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12144 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	12145 _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	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 DW_MUTEX_UNLOCK;
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 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	12149 }
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	12150 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	12151 (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	12152 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12153 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12154
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12155 thisname = "changed";
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	12156
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12157 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	12158 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	12159 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	12160 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	12161 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	12162 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	12163 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	12164 }
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	12165 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	12166 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12167 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	12168 }
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	12169 _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	12170
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12171 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12172 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	12173 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12174 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	12175 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12176 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	12177 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	12178 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	12179 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12180 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	12181 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	12182 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12183 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	12184 _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	12185
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12186 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	12187
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 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	12189 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	12190 }
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12191 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	12192 {
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12193 /* 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	12194 * 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	12195 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12196 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	12197 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	12198 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12199 return;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	12200 }
775 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 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	12202 {
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 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	12204 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	12205 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	12206 }
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12207 #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	12208 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	12209 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12210 #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	12211 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	12212 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12213 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	12214 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	12215 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12216 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	12217 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	12218 _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	12219
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12220 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	12221
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12222 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	12223 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	12224 params[2] = (void *)thiswindow;
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12225 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	12226 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	12227 _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	12228
2008 74facb490f5a GTK: Fix html changed callbacks when using webkit1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2007 diff changeset	12229 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	12230 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	12231
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12232 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	12233 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12234 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12235 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	12236 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12237 /* 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	12238 * 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	12239 */
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12240 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	12241 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	12242 #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	12243 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	12244 #endif
2006 6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12245 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	12246 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12247 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2005 diff changeset	12248 #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	12249 #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	12250 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	12251 {
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 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	12253 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	12254 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	12255 }
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 #endif
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	12257 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	12258 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12259 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	12260 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12261 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	12262 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12263 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	12264 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12265
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12266 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	12267 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12268 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	12269 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12270 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	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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12273 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	12274 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	12275 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12276 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	12277 _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	12278 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12279 }
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 /*
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 * 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	12283 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12284 * 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	12285 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12286 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	12287 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12288 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	12289 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	12290 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	12291 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	12292
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12293 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12294 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	12295 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	12296 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	12297
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12298 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	12299 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12300 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	12301
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12302 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	12303 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	12304
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12305 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	12306 _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	12307 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12308 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12309 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12310
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12311 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12312 * 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	12313 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12314 * 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	12315 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12316 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	12317 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12318 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	12319 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	12320 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	12321
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12322 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	12323 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	12324 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	12325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12326 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	12327 _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	12328 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	12329 DW_MUTEX_UNLOCK;
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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12332 /*
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 * 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	12334 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12335 * 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	12336 * 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	12337 */
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 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	12339 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12340 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	12341 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	12342 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	12343
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12344 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12345 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	12346 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	12347
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12348 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	12349 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12350 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	12351
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12352 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	12353 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	12354
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 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	12356 _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	12357 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12359 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12360
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12361 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12362 * 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	12363 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12364 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12365 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12366 * 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	12367 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12368 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12369 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	12370 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12371 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	12372
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12373 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12374 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	12375 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	12376 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	12377 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12378 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12379 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12380 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12381 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12382 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12383 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12384
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12385 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12386 * 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	12387 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12388 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12389 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12390 * 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	12391 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12392 */
2036 48b91f535f82 GTK: More const changes... a few more commits to finish. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2030 diff changeset	12393 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	12394 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12395 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	12396
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12397 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12398 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	12399 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	12400 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	12401 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12402 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12403 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12404 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12405 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12406 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	12407 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12408
2090 cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12409 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12410 * 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	12411 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12412 * 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	12413 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12414 * 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	12415 * 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	12416 * 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	12417 * 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	12418 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12419 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	12420 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12421 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12422 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12423 #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	12424 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	12425 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12426 #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	12427 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	12428 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12429 #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	12430 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	12431 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12432 #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	12433 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	12434 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12435 #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	12436 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	12437 #endif
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	12438 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	12439 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	12440 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	12441 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12442 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	12443 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12444 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12445
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12446 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12447 * 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	12448 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12449 * 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	12450 * 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	12451 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12452 * 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	12453 * 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	12454 * 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	12455 * Remarks:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12456 * 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	12457 * 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	12458 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12459 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	12460 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12461 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12462 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12463 /* 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	12464 #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	12465 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	12466 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12467 #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	12468 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	12469 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12470 #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	12471 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	12472 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12473 #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	12474 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	12475 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2088 diff changeset	12476 #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	12477 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	12478 #endif
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	12479 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	12480 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	12481 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	12482 /* 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	12483 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12484 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	12485 }
2091 68f1924fdd13 Restructure feature switch so fallback return is in the default case. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2090 diff changeset	12486 }

Mercurial > dwindows

annotate gtk3/dw.c @ 2211:9395c1efa98b