dwindows: gtk3/dw.c annotate

annotate gtk3/dw.c @ 2005:a17cc1958369

GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. Use linker to pull in webkit libraries instead of dlopen() etc.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 06 Nov 2019 08:48:49 +0000
parents	eb488c379969
children	6f1adc77de02

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 *
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	6 * (C) 2000-2019 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 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 #include "config.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	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>
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	38 #else
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	39 #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	40 #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	41
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	42 #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	43
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	44 #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	45 #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	46 #endif
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	47
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	48 #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	49 # 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	50 # 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	51 # 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	52 # 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	53 # 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	54 #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	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	56 #include "gtk/messagebox_error.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	57 #include "gtk/messagebox_warning.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	58 #include "gtk/messagebox_information.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	59 #include "gtk/messagebox_question.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	60
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	61 /* These are used for resource management */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	62 #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	63 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	64 #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	65
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	66 /* 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	67 * 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	68 * 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	69 * 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	70 * 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	71 * 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	72 * 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	73 */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	74 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	75 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	76 { 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	77 { 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	78 { 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	79 { 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	80 { 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	81 { 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	82 { 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	83 { 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	84 { 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	85 { 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	86 { 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	87 { 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	88 { 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	89 { 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	90 { 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	91 { 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	92 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	93
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	94 /*
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 * 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	96 */
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	97 #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	98 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	99 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	100 ".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	101 ".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	102 ".ico",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	103 ".icns",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	104 ".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	105 ".jpg",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	106 ".jpeg",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	107 ".tiff",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	108 ".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	109 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	111 #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	112 # 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	113 #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	114
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 #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	116 # 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	117 #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	118
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	119 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	120 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	121 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	122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	123 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	124
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	125 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	126 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	127
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	128 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	129 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	130 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	131
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	132 #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	133 #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	134
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	135 #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	136 #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	137 #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	138
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	139 #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	140 #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	141 #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	142 #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	143
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	144 /* 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	145 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	146 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	147 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	148 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	149 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	150 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	151 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	152 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	153 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	154 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	155 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	156 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	157 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	158 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	159 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	160 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	161 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	162 static gint _column_click_event(GtkWidget *widget, gpointer data);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	163 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	164
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	165 GObject *_DWObject = 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	166 char *_DWDefaultFont = NULL;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	167 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	168
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	169 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	170 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	171 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	172 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	173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	174 } 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	175
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	176 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	177 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	178 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	179 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	180 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	181 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	182 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	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 } 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	185
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	186 #define SIGNALMAX 18
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	187
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	188 /* 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	189 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	190 { _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	191 { _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	192 { _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	193 { _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	194 { _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	195 { _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	196 { _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	197 { _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	198 { _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	199 { _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	200 { _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	201 { _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	202 { _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	203 { _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	204 { _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	205 { _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	206 { _column_click_event, DW_SIGNAL_COLUMN_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	207 { _tree_expand_event, DW_SIGNAL_TREE_EXPAND }
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 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	210 /* 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	211 #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	212 #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	213 #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	214 #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	215 #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	216
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	217 #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	218 /* MDI Support Code */
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	219 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	220 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	221 #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	222 #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	223 #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	224
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	225 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	226 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	227 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	228 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	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 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	231 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	232 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	233 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	234 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	235 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	236
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	237 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	238 {
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 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	240 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	241
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 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	243 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	244 };
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 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	247 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	248 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	249
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 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	251 };
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 #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	254 #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	255 #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	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 #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	258 #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	259 #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	260 #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	261 #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	262 #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	263 #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	264
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	265 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	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 _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	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 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	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 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	272 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	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 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	275 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	276 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	277 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	278
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 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	280 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	281
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 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	283 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	284
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	285 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	286 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	287 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	288 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	289 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	290
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 /* 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	292 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	293 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	294 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	295 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	296 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	297
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 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	299 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	300 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	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 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	303
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	304 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	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 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	307
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	308 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	309 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	310
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	311 static 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	312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	313 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	314 NULL,
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 NULL,
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 (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	317 NULL,
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 NULL,
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 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	320 0,
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 (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	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
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 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	325 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	326 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	327 }
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 /* 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	330 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	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 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	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 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	335 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	336
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 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	338 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	339
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 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	341
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 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	343 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	344 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	345 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	346 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	347
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 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	349 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	350 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	351 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	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
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 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	355 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	356 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	357 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	358 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	359
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	360 static 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	361 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	362 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	363 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	364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	365 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	366 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	367 _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	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 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	370 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	371
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 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	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 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	375
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	376 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	377 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	378
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	379 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	380 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	381 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	382 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	383 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	384
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	385 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	386 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	387 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	388 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	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 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	391 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	392 #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	393 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	394 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	395 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	396 #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	397 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	398 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	399 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	400 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	401 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	402
775 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 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	404 {
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 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	406 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	407 }
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
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	409 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	410
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	411 _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	412 _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	413 _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	414 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	415 {
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	416 _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	417 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	418 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	419 _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	420 #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	421 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	422 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	423 #else
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	424 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	425 #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	426
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	427 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	428 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	429 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	430
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	431
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	432 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	433 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	434 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	435 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	436 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	437 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	438 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	439 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	440 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	441 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	442 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	443 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	444
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	445
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	446 /* 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	447 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	448 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	449 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	450 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	451 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	452
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	453 /* 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	454 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	455 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	456 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	457
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	458 /* 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	459 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	460
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	461 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	462
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 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	464 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	465 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	466 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	467 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	468 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	469 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	470 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	471 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	472
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	473 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	474 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	475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	476 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	477 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	478 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	479 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	480 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	481 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	482 {
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 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	484 }
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
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	486 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	487 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	488 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	489 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	490 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	491 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	492
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 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	494 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	495 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 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	497 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	498 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	499 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	500 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	501 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	502 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	503 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	504 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	505 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	506 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	507 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	508 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	510 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	511 {
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 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	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_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	515 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	516
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 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	518 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	519
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 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	521 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	522 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	523 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	524 }
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
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 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	527 {
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 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	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 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	531 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	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 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	534 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	535
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 *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	537 *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	538 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	539
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	540 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	541 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	542 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	543
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 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	545 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	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 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	548 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	549
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 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	551 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	552 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	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
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 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	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 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	558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	559 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	560 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	561 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	562 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	563 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	564
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 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	566 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	567 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	568 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	569 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	570 GdkWindow *thiswindow;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	571 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	572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	573 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	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 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	576 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	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 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	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 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	581 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	582 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	583 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	584 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	585 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	586 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	587 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	588 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	589 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	590 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	591 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	592
775 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 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	594 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	595 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	596
775 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 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	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
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	600 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	601 {
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 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	603 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	604 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	605 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	606
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 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	608 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	609
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 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	611 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	612 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	613 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	614 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	615
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	616 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	617 {
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	618 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	619 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	620 }
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 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	622
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	623 static void gtk_mdi_get_preferred_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	624 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	625 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	626 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	627 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	628 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	629
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	630 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	631 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	632
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	633 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	634 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	635 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	636 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	637 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	638
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 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	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 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	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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	645
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	646 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	647 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	648 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	649 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	650 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	651 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	652 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	653
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	654 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	655
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	656 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	657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	658 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	659 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	660 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	661 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	662 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	663 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	664
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	665
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 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	667 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	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 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	670 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	671
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 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	673 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	674 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	675 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	676 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	677 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	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 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	680 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	681 if ((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	682 {
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 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	684 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	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 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	687 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	688 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	689 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	690 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	691 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	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 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	694 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	695 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	696 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	697 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	698 {
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 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	700 {
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 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	702 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	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 = 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	705 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	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 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	708 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	709 {
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 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	711 {
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->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	713 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	714 }
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.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	716 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	717 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	718 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	719 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	720 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	721 }
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 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	723 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	724 }
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 }
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
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	727 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	728 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	729 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	730 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	731 GtkMdi *mdi;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	732 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	733
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 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	735 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	736 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	737
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	738 mdi = GTK_MDI (widget);
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	739
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	740 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	741 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	742 GtkAllocation allocation;
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	743
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	744 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	745 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	746 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	747
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	748 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	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 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	751 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	752 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	753 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	754 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	755 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	756 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	757
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 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	759 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	760 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	761 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	762 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	763 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	764
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	765 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	766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	767 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	768 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	769 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	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 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	772
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	773 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	774 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	775 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	776 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	777 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	778 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	779
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 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	781 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	782
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	783 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	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 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	786 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	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 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	789 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	790 }
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 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	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 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	795 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	796 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	797
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 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	799
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 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	801
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 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	803 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	804 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	805 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	806 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	807
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	808 (*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	809 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	810 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	811
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 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	813 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	814 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	815 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	816
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	817 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	818 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	819
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	820 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	821 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	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
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 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	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 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	827 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	828 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	829 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	830 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	831 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	832 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	833 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	834 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	835 #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	836 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	837 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	838 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	839 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	840 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	841 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	842 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	843 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	844 FALSE,
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 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	846 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	847 NULL,
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 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	849 #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	850 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	851
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	852 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	853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	854 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	855 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	856 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	857 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	858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	859 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	860 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	861 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	862
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	863 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	864 {
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 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	866
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	867 #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	868 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	869 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	870 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	871 #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	872 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	873
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 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	875 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	876
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	877 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	878 }
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 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	880
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 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	882 {
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 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	884
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	885 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	886 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	887
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	888 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	889
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	890
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	891 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	892 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	893
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 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	896 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	897 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	898
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 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	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
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 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	904 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	905
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 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	907 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	908 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	909 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	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 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	912 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	913
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	914 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	915 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	916
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	917 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	918 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	919 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	920 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	921 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	922 #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	923 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	924 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	925 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	926 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	927 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	928 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	929 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	930 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	931 FALSE,
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 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	933 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	934 NULL,
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 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	936 #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	937 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	938
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	939 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	940 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	941 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	942 GtkAllocation allocation;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	943
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	944 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	945 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	946 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	947 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	948 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	949 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	950 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	951
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 }
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 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	954
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 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	956 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	957 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	958
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 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	960 {
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 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	962 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	963
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	964 #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	965 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	966 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	967 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	968 #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	969 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	970
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 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	972 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	973 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	974
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	975 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	976 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	977
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	978 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	979 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	980 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	981 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	982
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	983 case GDK_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	984 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	985 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	986 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	987 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	988
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	989 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	990 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	991
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	992 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	993
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	994 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	995 width = x + allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	996 height = y + allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	997
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	998 width = MAX (width, GTK_MDI_MIN_WIDTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	999 height = MAX (height, GTK_MDI_MIN_HEIGHT);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1001 gtk_widget_set_size_request (child->widget, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1002 gtk_widget_queue_resize (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1003 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1004 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1005
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1006 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	1007 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	1008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1009
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 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	1011 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1012
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1013 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	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 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	1016 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	1017 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	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 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	1020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1021 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	1022 {
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 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	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 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	1026 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	1027 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	1028 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1029
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 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	1031 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1032 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	1033 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	1034 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	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 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	1037 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1038 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	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_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	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 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	1043 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	1044 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	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
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 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	1048 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1049 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	1050 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	1051
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1052 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	1053 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	1054
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1055 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	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 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	1058 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	1059 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1060
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 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	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 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	1064
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1065 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	1066 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	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 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	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 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	1071 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	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 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	1074 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	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
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 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	1078 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	1079 #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	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 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	1082 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1083 #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	1084 /* 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	1085 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	1086
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 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	1088 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	1089 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1090 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	1091 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	1092 }
775 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 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	1094
775 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 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	1096 #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	1097 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	1098 #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	1099 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1100
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 /* Finds the translation function for a given signal 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	1102 static void _findsigfunc(char signame)
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 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	1105
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1106 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	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 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	1109 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	1110 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1111 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	1112 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1113
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1114 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	1115 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1116 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	1117
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1118 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1119 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1120 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1121 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	1122 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	1123 char text[100];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1124
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1125 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	1126 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	1127 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	1128 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	1129 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	1130 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	1131 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	1132 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	1133 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	1134 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	1135 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1136 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	1137 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1138
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1139 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	1140 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1141 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	1142 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	1143
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1144 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	1145 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	1146 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	1147 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	1148 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	1149 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	1150 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	1151 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	1152 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	1153 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	1154 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	1155 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	1156 }
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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1158 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	1159 {
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	1160 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	1161 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	1162
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 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	1164 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	1165 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	1166 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	1167 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	1168 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	1169 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	1170 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	1171 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	1172 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	1173
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 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	1175 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	1176
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 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	1178 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1179
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1180 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	1181 {
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_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	1185 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	1186 }
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
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 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	1189 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1190 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	1191 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	1192
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 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	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 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	1196
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1197 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	1198 }
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 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	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
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 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	1203 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1204 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	1205 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	1206
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1207 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	1208 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1209 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	1210 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	1211
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1212 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	1213 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	1214 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	1215 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	1216
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1217 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	1218 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1219 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	1220 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1221
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1222 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	1223 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1224 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	1225 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	1226
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1227 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	1228 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1229 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	1230 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	1231
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1232 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	1233 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	1234 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	1235 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	1236
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1237 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	1238 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1239 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	1240 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1241
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1242 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	1243 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1244 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	1245 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	1246
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1247 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	1248 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1249 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	1250 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	1251 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	1252
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1253 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	1254 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	1255 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	1256 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1257 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	1258 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	1259 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	1260 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1261
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1262 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	1263 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	1264 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	1265 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	1266 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	1267 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	1268
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1269 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	1270 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1271 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	1272 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1273
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1274 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	1275 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1276 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	1277 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	1278
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1279 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	1280 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1281 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	1282
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1283 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	1284 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1285 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	1286 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1288 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	1289 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1290 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	1291 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	1292
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1293 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	1294 {
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1295 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	1296 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	1297 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	1298
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1299 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	1300
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1301 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	1302 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	1303 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1304 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	1305 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1306
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1307 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	1308 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1309 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	1310 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	1311
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1312 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	1313 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1314 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	1315
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1316 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	1317 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1318 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	1319 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1321 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	1322 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1323 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	1324 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	1325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1326 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	1327 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1328 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	1329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1330 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	1331 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	1332 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1333 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	1334 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1336 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	1337 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1338 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	1339 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	1340
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1341 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	1342 {
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 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	1344
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 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	1346 }
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 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	1348 }
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
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1350 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	1351 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1352 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	1353 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	1354
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1355 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	1356 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1357 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	1358 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	1359
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1360 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	1361 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	1362 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	1363 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	1364 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1365 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	1366 }
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
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	1368 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	1369 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1370 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	1371 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	1372
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1373 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	1374 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	1375
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	1376 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	1377 {
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	1378 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	1379
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	1380 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	1381 {
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	1382 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	1383 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1384
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1385 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	1386
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1387 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	1388 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1389 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	1390
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1391 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	1392 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1393 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	1394
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1395 if(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1396 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1397 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	1398
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1399 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	1400 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1401 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	1402 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1403 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1404
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1405 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	1406 }
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	1407 }
775 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 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	1409 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1410
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1411 #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	1412 #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	1413
775 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 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	1415 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1416 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	1417 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	1418
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1419 if(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	1420 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1421 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	1422 {
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 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	1424 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	1425 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	1426
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1427 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	1428 {
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 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	1430 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	1431 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	1432
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1433 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	1434 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	1435 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1436 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	1437 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1438 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	1439 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1440 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1441 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1442 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	1443 }
775 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 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1445 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1446 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1447 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1448
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1449 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	1450 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1451 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1452 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1453
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1454 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	1455 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1456 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	1457 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1458 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	1459 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1460 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1461 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1462 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	1463 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1464 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1465 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1466 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1467 }
775 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
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 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	1471 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1472 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	1473 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1474 }
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 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	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
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 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	1479 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1480 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	1481 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	1482
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 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	1484 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1485 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	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 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	1488 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1489 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	1490 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	1491 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	1492 void *itemdata = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1493 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	1494
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1495 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	1496 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1497 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	1498 return TRUE;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1499 }
775 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
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1501 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	1502 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	1503 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1504 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	1505 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1506 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	1507 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	1508 }
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	1509 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	1510 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1511 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	1512 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	1513 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1514 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1515 {
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	1516 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	1517
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	1518 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	1519 {
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	1520 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	1521
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	1522 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	1523 {
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	1524 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	1525
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	1526 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	1527 }
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 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	1529 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1530 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1531 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1532 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1533 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 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
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1536 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	1537 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1538 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1539 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1540
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1541 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	1542 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1543 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	1544 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1545 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	1546 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	1547 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1548 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	1549 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1550 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	1551 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	1552 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1553 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1554 {
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1555 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	1556
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 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	1558 {
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	1559 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	1560
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1561 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	1562 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1563 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1564 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1565 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1566 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1567 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1568 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1569 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	1570 }
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 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	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
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 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	1576 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1577 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	1578 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	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 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	1581 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1582 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	1583 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	1584 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1585 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	1586 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1587
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1588 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	1589 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1590 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	1591 GdkEventKey keyevent = (GdkEventKey )event;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1592 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	1593 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	1594
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 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	1596 {
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1597 /* 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	1598 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	1599 (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	1600 {
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1601 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	1602 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	1603 void *data = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1604
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1605 /* 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	1606 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	1607 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1608 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	1609 }
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 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1612 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	1613 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1614 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1615 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	1616
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1617 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	1618 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1619 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1620 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1621
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1622 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	1623 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1624 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	1625 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1626 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	1627 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	1628 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1629 g_free(text);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1630 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1631 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1632 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1633 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1634 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1635 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1636 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1637 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	1638 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1639
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 /* 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	1641 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	1642 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1643 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	1644 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	1645 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	1646
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1647 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	1648 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1649 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	1650 {
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 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	1652 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	1653 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1655 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	1656 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1658
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1659 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	1660 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1661 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	1662 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	1663
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1664 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	1665 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1666 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	1667 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	1668 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1669 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	1670 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1671
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1672 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	1673 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1674 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	1675 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	1676
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1677 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1678 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1679 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	1680 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	1681
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1682 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1683 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1684 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	1685
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1686 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	1687 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	1688
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1689 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1690 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1691 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	1692 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	1693 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	1694 }
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	1695 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1696 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1697 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	1698 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1700 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	1701 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1702 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	1703
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1704 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	1705 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	1706
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1707 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	1708 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1709
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1710 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	1711 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1712 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	1713 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	1714 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	1715
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1716 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	1717 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	1718
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1719 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	1720 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	1721 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	1722
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1723 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	1724 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	1725
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1726 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	1727 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1728
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1729 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	1730 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1731 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	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 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	1734 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1735 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	1736
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	1737 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	1738 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	1739 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	1740 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	1741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1743 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	1744 }
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 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	1747 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1748 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	1749
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1750 if(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	1751 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1752 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	1753 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1754 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	1755 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	1756 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	1757 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	1758 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1759 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1760 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	1761 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1762
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1763 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	1764 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1765 char *data = 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	1766 int z, id = GPOINTER_TO_INT(icon);
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1767
1289 5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1768 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1769 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1770 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1771
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1772 if(id > 65535)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1773 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1774 GdkPixbuf *icon_pixbuf = icon;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1775
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1776 if(userwidth)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1777 *userwidth = gdk_pixbuf_get_width(icon_pixbuf);
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1778 if(userheight)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1779 *userheight = gdk_pixbuf_get_height(icon_pixbuf);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1780
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1781 return icon;
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1782 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1783
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1784 for(z=0;z<_resources.resource_max;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	1785 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1786 if(_resources.resource_id[z] == 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	1787 {
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 data = _resources.resource_data[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	1789 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	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 }
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
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 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	1794 {
1327 e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1795 GdkPixbuf *icon_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	1796
1327 e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1797 if(data[0] == 'G' && data[1] == 'd' && data[2] == 'k' && data[3] == 'P')
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1798 icon_pixbuf = gdk_pixbuf_new_from_inline(-1, (const guint8 *)data, FALSE, NULL);
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1799 else
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1800 icon_pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)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	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(userwidth)
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 *userwidth = gdk_pixbuf_get_width(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	1804 if(userheight)
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 *userheight = gdk_pixbuf_get_height(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	1806
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1807 return 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	1808 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1809 return NULL;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1811
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1812 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1813 * Initializes the Dynamic Windows engine.
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 * Parameters:
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 * newthread: True if this is the only 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	1816 * False if there is already a message loop running.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1817 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1818 int dw_int_init(DWResources res, int newthread, int argc, char **argv[])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1819 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1820 if(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	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 _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	1823 _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	1824 _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	1825 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1826
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1827 /* Setup the private data directory */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1828 if(argc && argv && argc > 0 && (argv)[0])
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1829 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1830 char pathcopy = strdup((argv)[0]);
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1831 char *pos = strrchr(pathcopy, '/');
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1832 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	1833
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1834 /* If we have a / then...
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1835 * 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	1836 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1837 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1838 {
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1839 binname = pos + 1;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1840 *pos = 0;
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1841 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	1842
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1843 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1844 {
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1845 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	1846
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1847 if(binpos)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1848 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	1849 else
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1850 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1851 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1852 strcat(_dw_share_path, binname);
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1853 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1854 if(pathcopy)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1855 free(pathcopy);
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1856 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1857 /* 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	1858 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	1859 _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	1860
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1861 #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	1862 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	1863 #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	1864
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1865 /* 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	1866 _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	1867 _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	1868 _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	1869
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1870 _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	1871
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1872 gtk_init(argc, argv);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1873
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	1874 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	1875 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	1876 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	1877
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	1878 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1879
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	1880 /* 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	1881 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	1882
775 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 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	1884 }
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 /*
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 * 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	1888 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1889 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	1890 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1891 _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	1892 _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	1893 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	1894 _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	1895 _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	1896 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1897
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1898 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1899 * 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	1900 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1901 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	1902 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1903 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	1904 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1905
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1906 /*
775 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 * 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	1908 * Parameters:
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 * 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	1910 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1911 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	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 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	1914 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	1915
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1916 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	1917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1918 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	1919 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1920 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	1921
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1922 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	1923
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1924 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	1925 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1926 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	1927
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1928 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	1929 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1930 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	1931 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1932 _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	1933 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	1934 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1935 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1936 _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	1937 }
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1938 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	1939 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	1940 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	1941 _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	1942 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	1943 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1944 _dw_thread = orig;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1945 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1946 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1947 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	1948 _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	1949 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1950 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1951 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	1952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1953 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1954 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	1955 _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	1956 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1957
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1958 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1959 * 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	1960 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1961 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	1962 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1963 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	1964 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	1965 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	1966
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1967 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	1968 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1969 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	1970 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1971 _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	1972 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	1973 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1974 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1975 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1976 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1977 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	1978 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1979 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1980 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1981 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	1982 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1983 _dw_thread = orig;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1984 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1985 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1986 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	1987 _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	1988 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1989 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1991
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1992 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1993 * 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	1994 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1995 * 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	1996 * 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	1997 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1998 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	1999 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2000 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	2001 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2002
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2003 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2004 * 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	2005 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2006 * 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	2007 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2008 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	2009 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2010 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	2011
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 ( tmp )
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 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	2015 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	2016 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	2017 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	2018 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	2019 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	2020 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2021 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	2022 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2023
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2024 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2025 * 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	2026 * 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	2027 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2028 * 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	2029 * 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	2030 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2031 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	2032 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2033 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	2034 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	2035 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	2036 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	2037 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	2038 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	2039 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	2040 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2041
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2042 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2043 * 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	2044 * 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	2045 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2046 * 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	2047 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2048 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	2049 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2050 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	2051 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	2052
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2053 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	2054 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	2055
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2056 /* _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	2057 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	2058 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2059 _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	2060 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	2061 _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	2062 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2063
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2064 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	2065 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2066 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	2067 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	2068 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2069 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	2070 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2071 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	2072 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	2073 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2074
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2075 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	2076 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2077 _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	2078 _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	2079 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2080
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 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	2082 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	2083 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	2084 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	2085 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2086
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2087 static int _dw_ok_func(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	2088 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2089 DWDialog dwwait = (DWDialog )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2090
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2091 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	2092 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	2093
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2094 dw_window_destroy((HWND)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	2095 dw_dialog_dismiss((DWDialog )data, (void )DW_MB_RETURN_OK);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2096 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	2097 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2098
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2099 int _dw_yes_func(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	2100 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2101 DWDialog dwwait = (DWDialog )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2103 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	2104 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	2105
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2106 dw_window_destroy((HWND)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	2107 dw_dialog_dismiss((DWDialog )data, (void )DW_MB_RETURN_YES);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2108 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	2109 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2111 int _dw_no_func(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	2112 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2113 DWDialog dwwait = (DWDialog )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2114
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2115 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	2116 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	2117
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 dw_window_destroy((HWND)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	2119 dw_dialog_dismiss((DWDialog )data, (void )DW_MB_RETURN_NO);
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 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	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
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 int _dw_cancel_func(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	2124 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2125 DWDialog dwwait = (DWDialog )data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2126
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2127 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	2128 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	2129
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2130 dw_window_destroy((HWND)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	2131 dw_dialog_dismiss((DWDialog )data, (void )DW_MB_RETURN_CANCEL);
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 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	2133 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2134
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2135 /*
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	2136 * 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	2137 * 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	2138 * 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	2139 * ...: 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	2140 */
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	2141 void API dw_debug(char *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	2142 {
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	2143 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	2144 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	2145
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	2146 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	2147 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	2148 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	2149
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	2150 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	2151 }
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	2152
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	2153 /*
775 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 * 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	2155 * Parameters:
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 * 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	2157 * 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	2158 * 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	2159 * ...: 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	2160 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2161 int dw_messagebox(char title, int flags, char 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	2162 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2163 HWND entrywindow, texttargetbox, imagetextbox, mainbox, okbutton, nobutton, yesbutton, cancelbutton, buttonbox, stext;
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 ULONG flStyle = DW_FCF_TITLEBAR \| DW_FCF_SHELLPOSITION \| 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	2165 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	2166 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	2167 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	2168 char **xpm_data = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2169 int x, y, extra_width=0,text_width,text_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	2170 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	2171
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 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	2173 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	2174 va_end(args);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2176 entrywindow = dw_window_new(HWND_DESKTOP, title, 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	2177 mainbox = dw_box_new(DW_VERT, 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	2178 dw_box_pack_start(entrywindow, mainbox, 0, 0, TRUE, TRUE, 0);
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2180 /* determine if an icon is to be used - if so we need another HORZ 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	2181 if((flags & DW_MB_ERROR) \| (flags & DW_MB_WARNING) \| (flags & DW_MB_INFORMATION) \| (flags & DW_MB_QUESTION))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2182 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2183 imagetextbox = dw_box_new(DW_HORZ, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2184 dw_box_pack_start(mainbox, imagetextbox, 0, 0, TRUE, TRUE, 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	2185 texttargetbox = imagetextbox;
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 }
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 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	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 imagetextbox = NULL;
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 texttargetbox = mainbox;
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 if(flags & DW_MB_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	2194 xpm_data = (char **)_dw_messagebox_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	2195 else if(flags & DW_MB_WARNING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2196 xpm_data = (char **)_dw_messagebox_warning;
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 else if(flags & DW_MB_INFORMATION)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2198 xpm_data = (char **)_dw_messagebox_information;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2199 else if(flags & DW_MB_QUESTION)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2200 xpm_data = (char **)_dw_messagebox_question;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2202 if(xpm_data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2203 extra_width = 32;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2204
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2205 if(texttargetbox == imagetextbox)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2206 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2207 HWND handle = dw_bitmap_new( 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	2208 GdkPixbuf icon_pixbuf = gdk_pixbuf_new_from_xpm_data((const char *)xpm_data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2210 gtk_image_set_from_pixbuf(GTK_IMAGE(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	2211
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2212 dw_box_pack_start( texttargetbox, handle, 32, 32, FALSE, FALSE, 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	2213 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2214
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2215 /* Create 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	2216 text_width = 240;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2217 text_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	2218 stext = dw_text_new(outbuf, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2219 dw_window_set_style(stext, DW_DT_WORDBREAK, 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	2220 dw_font_text_extents_get(stext, NULL, outbuf, &width, &height);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2221
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	2222 text_width = min( width, dw_screen_width() - extra_width - 100 );
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	2223 text_height = min( height, dw_screen_height() );
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 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 dw_box_pack_start(texttargetbox, stext, text_width, text_height, TRUE, TRUE, 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	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 /* Buttons */
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 buttonbox = dw_box_new(DW_HORZ, 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	2229
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 dw_box_pack_start(mainbox, buttonbox, 0, 0, TRUE, FALSE, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2231
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2232 dwwait = dw_dialog_new((void *)entrywindow);
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
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 /* which buttons ? */
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 if(flags & DW_MB_OK)
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 okbutton = dw_button_new("Ok", 1001L);
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 dw_box_pack_start(buttonbox, okbutton, 50, 30, TRUE, FALSE, 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	2239 dw_signal_connect(okbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_ok_func), (void *)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	2240 }
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 else if(flags & DW_MB_OKCANCEL)
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 okbutton = dw_button_new("Ok", 1001L);
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 dw_box_pack_start(buttonbox, okbutton, 50, 30, TRUE, FALSE, 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	2245 dw_signal_connect(okbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_ok_func), (void *)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	2246 cancelbutton = dw_button_new("Cancel", 1002L);
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 dw_box_pack_start(buttonbox, cancelbutton, 50, 30, TRUE, FALSE, 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	2248 dw_signal_connect(cancelbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_cancel_func), (void *)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	2249 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2250 else if(flags & DW_MB_YESNO)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2251 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2252 yesbutton = dw_button_new("Yes", 1001L);
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 dw_box_pack_start(buttonbox, yesbutton, 50, 30, TRUE, FALSE, 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	2254 dw_signal_connect(yesbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_yes_func), (void *)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	2255 nobutton = dw_button_new("No", 1002L);
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 dw_box_pack_start(buttonbox, nobutton, 50, 30, TRUE, FALSE, 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	2257 dw_signal_connect(nobutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_no_func), (void *)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	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 else if(flags & DW_MB_YESNOCANCEL)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2260 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2261 yesbutton = dw_button_new("Yes", 1001L);
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 dw_box_pack_start(buttonbox, yesbutton, 50, 30, TRUE, FALSE, 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	2263 dw_signal_connect(yesbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_yes_func), (void *)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	2264 nobutton = dw_button_new("No", 1002L);
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 dw_box_pack_start(buttonbox, nobutton, 50, 30, TRUE, FALSE, 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	2266 dw_signal_connect(nobutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_no_func), (void *)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	2267 cancelbutton = dw_button_new("Cancel", 1003L);
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 dw_box_pack_start(buttonbox, cancelbutton, 50, 30, TRUE, FALSE, 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	2269 dw_signal_connect(cancelbutton, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_dw_cancel_func), (void *)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	2270 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2271
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 height = max(50,text_height)+100;
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	2273 x = (dw_screen_width() - (text_width+60+extra_width))/2;
775 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 y = (dw_screen_height() - height)/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	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 dw_window_set_pos_size(entrywindow, x, y, (text_width+60+extra_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	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 dw_window_show(entrywindow);
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
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	2280 return GPOINTER_TO_INT(dw_dialog_wait(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	2281 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2282
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2283 /*
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 * 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	2285 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2286 * 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	2287 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2288 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	2289 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2290 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	2291 #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	2292 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	2293 #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	2294
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 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	2296 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	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 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	2299 #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	2300 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	2301 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2302 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	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
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2305 #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	2306 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2307 gtk_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	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 DW_MUTEX_UNLOCK;
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2313 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2314 * 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	2315 * Parameters:
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 * 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	2317 */
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 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	2319 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 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	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 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	2323 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	2324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2325 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326 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	2327 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2328 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	2329 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2330
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2331 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2332 * 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	2333 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2334 * 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	2335 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2336 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	2337 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2338 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	2339
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2340 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	2341 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	2342
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 DW_MUTEX_LOCK;
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 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	2345 DW_MUTEX_UNLOCK;
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 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	2347 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2349 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2350 * 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	2351 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2352 * 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	2353 */
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 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	2355 {
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 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	2357 GtkWidget *defaultitem;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2358 #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	2359 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2360 #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	2361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2362 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	2363 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	2364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2365 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2366 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	2367 #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	2368 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	2369 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2370 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	2371 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2372 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2373 #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	2374 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2375 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	2376 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	2377 {
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	2378 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	2379 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	2380
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2381 /* 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	2382 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	2383 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2384 /* 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	2385 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	2386 /* 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	2387 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	2388 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	2389 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2390
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2391 /* 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	2392 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	2393 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2394 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	2395 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	2396
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2397 /* 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	2398 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	2399 /* 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	2400 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	2401 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2402
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2403 gdk_window_raise(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2404 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	2405 gdk_window_show(window);
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	2406 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	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 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	2409 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	2410 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	2411 }
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 DW_MUTEX_UNLOCK;
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 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	2414 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2415
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2417 * 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	2418 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2419 * 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	2420 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2421 int 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	2422 {
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 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	2424 #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	2425 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	2426 #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	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 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	2429 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	2430
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2431 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	2432 #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	2433 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	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 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	2436 }
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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2438 #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	2439 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	2440 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2441 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2442 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2443
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2444 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2445 * 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	2446 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2447 * handle: The window handle to 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	2448 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2449 int dw_window_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	2450 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2451 int _locked_by_me = FALSE;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2452 #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	2453 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	2454 #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	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 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	2457 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	2458
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 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	2460 #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	2461 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	2462 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2463 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	2464 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2465 #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	2466 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	2467 {
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	2468 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	2469 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	2470
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	2471 /* 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	2472 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	2473 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	2474
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2475 /* 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	2476 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	2477 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2478 /* 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	2479 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	2480 #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	2481 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	2482 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	2483
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2484 /* 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	2485 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	2486 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2487 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	2488 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2489 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	2490 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2491 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	2492 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2493 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2494 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2495 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2496 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2497 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2498 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	2499 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2500 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	2501 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2502 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	2503 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2504 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2505 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2506 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2507 #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	2508
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2509 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	2510 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2511 /* 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	2512 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	2513 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	2514 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2515 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2516 /* Finally destroy the widget */
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	2517 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	2518 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2519 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2520 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2521 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2522
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2523 /* 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	2524 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2525 * 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	2526 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2527 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	2528 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2529 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2531 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2532 * 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	2533 * Parameters:
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 * 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	2535 * 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	2536 */
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 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	2538 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2539 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	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 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	2542 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	2543 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2544 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2545
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2546 /*
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2547 * 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	2548 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2549 * 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	2550 */
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2551 void API dw_font_set_default(char *fontname)
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2552 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2553 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	2554
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2555 _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	2556
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2557 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	2558 free(oldfont);
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2559 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2560
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	2561 /* 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	2562 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	2563 {
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	2564 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	2565
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	2566 /* 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	2567 * 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	2568 * 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	2569 */
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	2570 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	2571 {
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	2572 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	2573 *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	2574 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	2575 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	2576 }
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	2577 }
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	2578
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2579 /* 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	2580 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	2581 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2582 if(color)
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2583 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2584 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	2585 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	2586 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	2587
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2588 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	2589 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	2590 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	2591 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	2592 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	2593 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2594 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2595
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2596 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	2597 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2598 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	2599 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	2600
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2601 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	2602 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	2603 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	2604 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	2605 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2606
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2607 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2608 * 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	2609 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2610 * 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	2611 * 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	2612 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2613 int dw_window_set_font(HWND handle, char *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	2614 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2615 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	2616 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	2617 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	2618 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	2619
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2620 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2621 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	2622 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2623 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	2624 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	2625 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	2626 }
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	2627 /* 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	2628 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	2629 {
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	2630 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	2631 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	2632 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	2633 }
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2634 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	2635 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2636 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	2637 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	2638 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	2639 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2640
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	2641 _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	2642
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2643 /* 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	2644 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	2645 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	2646 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	2647 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	2648
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2649 _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	2650
775 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 DW_MUTEX_UNLOCK;
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 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	2653 }
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
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	2655 /* 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	2656 * 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	2657 * 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	2658 * 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	2659 * 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	2660 */
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	2661 char * API dw_font_choose(char *currfont)
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	2662 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2663 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	2664 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	2665 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	2666 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	2667 char *retfont = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2668
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2669 /* 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	2670 * 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	2671 * 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	2672 */
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	2673 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	2674 {
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	2675 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	2676 *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	2677 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	2678 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	2679 }
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	2680
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	2681 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	2682 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	2683 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	2684 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2685 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	2686 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	2687 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2688
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	2689 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	2690
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2691 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	2692 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2693 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	2694 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	2695 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2696 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	2697 /* 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	2698 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	2699 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2700 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	2701
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2702 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	2703 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2704 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2705 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2706 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	2707 /* 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	2708 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	2709 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2710 /* 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	2711 * 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	2712 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2713 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	2714 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	2715 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2716 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2717 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	2718 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2719 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2720 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	2721 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2722 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2723 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2724
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2725 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2726 * 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	2727 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2728 * 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	2729 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2730 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	2731 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2732 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	2733 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	2734 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	2735 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	2736 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	2737 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	2738
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 DW_MUTEX_LOCK;
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 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	2741 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2742 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	2743 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	2744 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	2745 }
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	2746 /* 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	2747 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	2748 {
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	2749 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	2750 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	2751 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	2752 }
775 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
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 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	2755 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	2756 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2757 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	2758 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	2759 {
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	2760 int len, x;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2761
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2762 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	2763 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	2764 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	2765 /* 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	2766 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	2767 {
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	2768 int size;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2769
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	2770 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	2771 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	2772 {
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	2773 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	2774 }
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	2775 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	2776 /* 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	2777 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	2778 {
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	2779 /* 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	2780 * 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	2781 */
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	2782 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	2783 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	2784 }
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	2785 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2786 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	2787 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2788 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2789 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2790 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	2791 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2793 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	2794 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2795 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	2796
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2797 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	2798 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	2799
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2800 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	2801
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2802 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	2803 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	2804 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2805
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2806 /* 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	2807 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	2808 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2809 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	2810 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	2811
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2812 _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	2813
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2814 *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	2815 *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	2816
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2817 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	2818 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	2819 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2820
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2821 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	2822 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2823 /* 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	2824 * 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	2825 */
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	2826 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	2827
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2828 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	2829 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2830 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	2831 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	2832 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	2833 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	2834 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2835 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	2836 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	2837
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2838 _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	2839
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2840 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	2841 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2842 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	2843 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	2844 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	2845 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	2846 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2847 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	2848 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	2849
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	2850 _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	2851
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2852 _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	2853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2854 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	2855 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2856 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2857 * 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	2858 * Parameters:
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 * 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	2860 * 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	2861 * 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	2862 */
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 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	2864 {
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 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	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
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 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	2871 {
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 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	2873 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	2874 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	2875 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	2876 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	2877 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2878 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	2879 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	2880 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2881 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	2882 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	2883 }
775 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 }
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 _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	2887
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2889 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	2890 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2893 * 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	2894 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2895 * 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	2896 * 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	2897 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2898 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	2899 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2900 /* 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	2901 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	2902 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2903
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2904 #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	2905 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2906 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2907 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2908 #endif
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2909
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2910 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2911 * 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	2912 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2913 * 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	2914 */
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 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	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 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	2918
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 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2920 #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	2921 _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	2922 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2923 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2924 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2925 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2926 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2927 _dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle));
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2928 gdk_device_grab(gdk_device_manager_get_client_pointer(manager),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2929 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	2930 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	2931 FALSE,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	2932 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	2933 NULL,
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2934 GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2935 #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	2936 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2937 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2938
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2939 /*
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 * 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	2941 * Parameters:
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 * 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	2943 * 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	2944 */
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 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	2946 {
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 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	2948 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	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 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	2951 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	2952 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	2953 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	2954 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	2955 }
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 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	2957 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	2958 else
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	2959 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	2960 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	2961 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	2962 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	2963 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	2964 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2966
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2967 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2968 * 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	2969 */
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 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	2971 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2972 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	2973
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2974 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2975 #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	2976 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2977 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2978 _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	2979 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2980 gdk_device_ungrab(gdk_device_manager_get_client_pointer(manager), GDK_CURRENT_TIME);
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2981 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	2982 #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	2983 DW_MUTEX_UNLOCK;
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 /*
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 * 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	2988 * Parameters:
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 * 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	2990 * 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	2991 * 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	2992 */
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 HWND dw_window_new(HWND hwndOwner, char *title, unsigned long 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	2994 {
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 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	2996 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	2997 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	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 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	3000 #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	3001 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	3002 {
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 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	3004
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3005 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	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 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	3008 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	3009 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	3010 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	3011 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	3012
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 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	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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3016 #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	3017 {
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3018 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	3019 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	3020
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	3021 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	3022
775 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 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	3024
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 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	3026 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	3027
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 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	3029
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 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	3031 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	3032
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3033 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	3034 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	3035
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3036 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	3037 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	3038
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	3039 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	3040 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	3041
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3042 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	3043 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	3044 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3045 {
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3046 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	3047 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	3048
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3049 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	3050 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	3051 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	3052
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	3053 /* 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	3054 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	3055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3056 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	3057 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	3058 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	3059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3060 if(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	3061 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	3062
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3063 if(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	3064 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	3065
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	3066 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	3067 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	3068 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	3069 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	3070 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	3071 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3072 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	3073 DW_MUTEX_UNLOCK;
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 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	3075 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3076
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3077 /*
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 * 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	3079 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3080 * 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	3081 * 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	3082 */
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 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	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 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	3086 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	3087
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3088 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	3089 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	3090 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	3091
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3092 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	3093 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	3094 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	3095 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	3096 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	3097 DW_MUTEX_UNLOCK;
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 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	3099 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3100
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3101 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3102 * 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	3103 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3104 * 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	3105 * 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	3106 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3107 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	3108 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3109 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	3110 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	3111
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_LOCK;
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 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	3114 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	3115
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3116 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	3117 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	3118
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 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	3120 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	3121 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	3122 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	3123 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	3124
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3125 #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	3126 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	3127 #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	3128 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	3129 #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	3130 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	3131 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	3132 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	3133
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3134 DW_MUTEX_UNLOCK;
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 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	3136 }
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
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 /*
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 * 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	3140 * Parameters:
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 * 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	3142 * 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	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 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	3145 {
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 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	3147 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	3148
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3149 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	3150 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	3151
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3152 DW_MUTEX_LOCK;
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 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	3154 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	3155 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	3156 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	3157 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	3158 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	3159 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	3165 * Parameters:
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 * 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	3167 * 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	3168 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3169 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	3170 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3171 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	3172 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	3173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3174 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	3175 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	3176
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3177 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3178 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	3179 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	3180 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	3181 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	3182 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	3183 {
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 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	3185 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3186 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3187 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3190 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3191 * 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	3192 * Parameters:
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 * 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	3194 * 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	3195 * 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	3196 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3197 HWND dw_groupbox_new(int type, int pad, char *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	3198 {
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	3199 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	3200 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	3201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3202 DW_MUTEX_LOCK;
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 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	3204 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	3205 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	3206
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3207 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	3208 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	3209 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	3210 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	3211 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	3212 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	3213 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	3214 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	3215 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	3216 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	3217 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3218 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	3219 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3220
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3221 #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	3222 /*
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 * 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	3224 * Parameters:
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 * 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	3226 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3227 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	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 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	3230 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	3231
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 DW_MUTEX_LOCK;
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 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	3234 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	3235 DW_MUTEX_UNLOCK;
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 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	3237 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3238 #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	3239
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3240 /*
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 * 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	3242 * Parameters:
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 * 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	3244 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3245 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	3246 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3247 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	3248 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	3249
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 DW_MUTEX_LOCK;
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 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	3252 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	3253 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	3254 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3255 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	3256 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3258 /*
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 * 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	3260 * Parameters:
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 * 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	3262 * 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	3263 */
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 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	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 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	3267 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	3268
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3269 DW_MUTEX_LOCK;
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 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	3271 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	3272 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	3273 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	3274 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	3275 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	3276 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	3277 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	3278 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	3279 DW_MUTEX_UNLOCK;
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 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	3281 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3283 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3284 * 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	3285 * Parameters:
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 * 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	3287 * 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	3288 */
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 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	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 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	3292 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	3293 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	3294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3295 DW_MUTEX_LOCK;
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 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	3297 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	3298 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	3299 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	3300 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	3301 DW_MUTEX_UNLOCK;
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 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	3303 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3304
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 * 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	3307 * Parameters:
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 * 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	3309 * 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	3310 * 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	3311 */
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 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	3313 {
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 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	3315 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	3316 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3317 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	3318
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3319 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	3320 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	3321 (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	3322 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3323 /* 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	3324 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	3325 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3326 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	3327 /* 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	3328 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	3329 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	3330 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	3331 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	3332 /* 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	3333 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	3334 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	3335 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	3336 }
775 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 DW_MUTEX_UNLOCK;
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 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	3339 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3340
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3341 /*
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 * 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	3343 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3344 * 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	3345 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3346 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	3347 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3348 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	3349 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3350 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	3351 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	3352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3353 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	3354 /* 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	3355 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	3356 (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	3357 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	3358 /* 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	3359 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	3360 *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	3361 DW_MUTEX_UNLOCK;
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 }
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 }
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
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 char _removetilde(char dest, char src)
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 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3367 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	3368 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	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 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	3371 {
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 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	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 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	3375 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	3376 }
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 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	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 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	3380 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	3381 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	3382 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3383 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3384 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	3385 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	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 /*
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 * 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	3390 * Parameters:
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 * 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	3392 * 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	3393 * 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	3394 * 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	3395 * 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	3396 * 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	3397 * 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	3398 */
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 HWND dw_menu_append_item(HMENUI menu, char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI 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	3400 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3401 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	3402 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	3403 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	3404 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	3405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3406 if (!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	3407 {
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 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	3409 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	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 DW_MUTEX_LOCK;
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 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	3414
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 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	3416 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	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 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	3419 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	3420 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	3421 {
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	3422 char numbuf[11] = {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	3423
775 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 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	3425 {
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 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	3427 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	3428 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3429 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	3430 #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	3431 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	3432 #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	3433 }
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	3434 snprintf(numbuf, 10, "%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	3435 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	3436 }
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 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	3438 {
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 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	3440 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	3441 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3442 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	3443 #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	3444 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	3445 #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	3446 }
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	3447 snprintf(numbuf, 10, "%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	3448 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	3449 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3450 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3451
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3452 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	3453
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3454 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	3455 {
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	3456 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	3457
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	3458 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	3459 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	3460 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	3461 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	3462 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	3463 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3464
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3465 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	3466 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	3467 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	3468 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	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 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	3471 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	3472 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3473 * 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	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 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	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 _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	3478 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	3479 _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	3480 }
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 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	3483 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	3484
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3485 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3486 return 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	3487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3489 GtkWidget _find_submenu_id(GtkWidget start, char *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	3490 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3491 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	3492 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	3493
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3494 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	3495 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	3496
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 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	3498 {
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	3499 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	3500 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	3501
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	3502 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	3503
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 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	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 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	3507 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	3508 }
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 }
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 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	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 /*
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 * 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	3515 * Parameters:
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 * 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	3517 * 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	3518 * 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	3519 * 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	3520 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3521 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	3522 {
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	3523 char numbuf[11];
775 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 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	3525 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	3526
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3527 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	3528 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	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 DW_MUTEX_LOCK;
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	3531 snprintf(numbuf, 10, "%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	3532 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	3533
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3534 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	3535 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3536 _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	3537 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	3538 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	3539 _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	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_UNLOCK;
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 }
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3545 * 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	3546 * Parameters:
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 * 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	3548 * 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	3549 * 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	3550 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3551 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	3552 {
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	3553 char numbuf[11] = {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	3554 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	3555 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	3556 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	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 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	3559 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	3560
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3561 DW_MUTEX_LOCK;
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	3562 snprintf(numbuf, 10, "%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	3563 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	3564
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 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	3566 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3567 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	3568 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	3569 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	3570 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	3571
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3572 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	3573 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3574 _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	3575 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	3576 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	3577 _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	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 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	3581 {
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 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	3583 {
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 _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	3585 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	3586 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	3587 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	3588 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	3589 _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	3590 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3591 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3592 DW_MUTEX_UNLOCK;
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
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 /*
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3596 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3597 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3598 * 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	3599 * 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	3600 * Returns:
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3601 * 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	3602 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3603 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	3604 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3605 char numbuf[11];
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3606 GtkWidget *tmphandle;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3607 int _locked_by_me = FALSE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3608 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3609
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3610 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3611 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3612
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3613 DW_MUTEX_LOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3614 snprintf(numbuf, 10, "%lu", id);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3615 tmphandle = _find_submenu_id(menu, numbuf);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3616
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3617 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3618 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3619 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3620 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	3621 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3622 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3623 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3624 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3625 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3626
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3627 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3628 * 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	3629 * Parameters:
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 * 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	3631 * 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	3632 * 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	3633 * 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	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 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	3636 {
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 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	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 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	3640 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	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 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	3643
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3644 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3645 #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	3646 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	3647 #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	3648 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	3649 #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	3650 *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	3651 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3652 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3653
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3654
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 * 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	3657 * Parameters:
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 * 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	3659 * 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	3660 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3661 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	3662 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3663 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	3664 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	3665 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	3666 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3667 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3668 #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	3669 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3670 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3671 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	3672 #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	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 DW_MUTEX_LOCK;
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 #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	3676 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3677 #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	3678 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	3679 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3680 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3681 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	3682 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	3683 #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	3684 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	3685 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	3686 #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	3687 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	3688 *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	3689 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	3690 *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	3691 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3692 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3693
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3694 /*
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 * 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	3696 * Parameters:
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 * 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	3698 * 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	3699 */
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 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	3701 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3702 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	3703 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3704 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3705 #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	3706 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3707 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3708 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	3709 #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	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 DW_MUTEX_LOCK;
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 #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	3713 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3714 #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	3715 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	3716 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3717 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3718 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	3719 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	3720 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3721 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	3722 #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	3723 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3724 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3725
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3726 #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	3727 #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	3728 #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	3729
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3730 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	3731 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3732 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3733
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3734 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	3735 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	3736 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	3737
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3738 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	3739 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	3740 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	3741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3742
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3743 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	3744 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3745 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	3746 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	3747 #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	3748 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	3749 #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	3750 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	3751 #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	3752 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	3753 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	3754 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3755
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3756 /*
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 * 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	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 * 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	3760 * 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	3761 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3762 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	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 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	3765 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	3766
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 DW_MUTEX_LOCK;
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(!(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	3769 {
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 DW_MUTEX_UNLOCK;
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 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	3772 }
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	3773 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	3774 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	3775 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3776 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	3777 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3778
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3779 /*
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 * 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	3781 * Parameters:
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 * 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	3783 * 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	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 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	3786 {
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 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	3788 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	3789 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	3790 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	3791 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	3792 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	3793
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3795 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	3796 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3797 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3798 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	3799 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3800 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	3801 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	3802 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	3803 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	3804 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	3805
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3806 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	3807 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	3808 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	3809 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	3810 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	3811 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	3812
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3813 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	3814 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	3815 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	3816
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3817 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	3818 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	3819 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	3820
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3821 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	3822 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	3823 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3825 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3827
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 * 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	3830 * Parameters:
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 * 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	3832 * 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	3833 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3834 HWND dw_text_new(char *text, 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	3835 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3836 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	3837 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	3838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3839 DW_MUTEX_LOCK;
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 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	3841
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3842 /* 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	3843 #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	3844 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	3845 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	3846 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3847 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	3848 #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	3849 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	3850 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	3851 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	3852 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	3853 DW_MUTEX_UNLOCK;
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 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	3855 }
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
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 /*
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 * 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	3859 * Parameters:
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 * 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	3861 * 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	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 HWND dw_status_text_new(char *text, 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	3864 {
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 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	3866 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	3867
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 DW_MUTEX_LOCK;
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 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	3870 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	3871 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	3872 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	3873 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	3874 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	3875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3876 /* 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	3877 #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	3878 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	3879 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	3880 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3881 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	3882 #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	3883 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	3884 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	3885 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	3886 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	3887 DW_MUTEX_UNLOCK;
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 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	3889 }
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 /*
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 * 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	3893 * Parameters:
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 * 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	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 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	3897 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3898 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	3899 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	3900
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3901 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3902 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	3903 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	3904 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	3905 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	3906 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	3907 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	3908 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	3909
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 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	3911 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	3912 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	3913 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	3914 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	3915 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	3916 DW_MUTEX_UNLOCK;
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 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	3918 }
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
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 /*
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 * 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	3922 * Parameters:
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 * 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	3924 * 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	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 HWND dw_entryfield_new(char *text, 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	3927 {
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 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	3929 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	3930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3931 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3932 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	3933
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 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	3935 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	3936
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 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	3938 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	3939
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3940 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	3941 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	3942 DW_MUTEX_UNLOCK;
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 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	3944 }
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 /*
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 * 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	3948 * Parameters:
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 * 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	3950 * 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	3951 */
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 HWND dw_entryfield_password_new(char *text, 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	3953 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3954 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	3955 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	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 DW_MUTEX_LOCK;
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 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	3959
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3960 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	3961 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	3962 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	3963
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3964 gtk_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	3965 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	3966
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3967 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	3968 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	3969 DW_MUTEX_UNLOCK;
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 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	3971 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3972
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3974 * 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	3975 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3976 * 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	3977 * 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	3978 */
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 HWND dw_combobox_new(char *text, 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	3980 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3981 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	3982 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	3983 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	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 DW_MUTEX_LOCK;
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 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	3987 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	3988 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	3989 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	3990 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	3991 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	3992 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	3993 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	3994 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	3995 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	3996 DW_MUTEX_UNLOCK;
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 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	3998 }
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
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 /*
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 * 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	4002 * Parameters:
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 * 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	4004 * 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	4005 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4006 HWND dw_button_new(char *text, 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	4007 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4008 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	4009 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	4010
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4011 DW_MUTEX_LOCK;
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 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	4013 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	4014 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	4015 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	4016 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	4017 DW_MUTEX_UNLOCK;
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 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	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 /*
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 * 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	4023 * Parameters:
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 * 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	4025 * 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	4026 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4027 HWND dw_bitmapbutton_new(char *text, 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	4028 {
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 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	4030 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	4031 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	4032
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4033 DW_MUTEX_LOCK;
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 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	4035 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	4036
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4037 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	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 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	4040 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	4041 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	4042 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4043 gtk_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	4044 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	4045 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4046 gtk_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	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 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	4049 DW_MUTEX_UNLOCK;
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 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	4051 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4053 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4054 * 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	4055 * Parameters:
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 * 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	4057 * 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	4058 * 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	4059 * 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	4060 * 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	4061 * (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	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 HWND dw_bitmapbutton_new_from_file(char text, unsigned long id, char 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	4064 {
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	4065 GtkWidget *tmp;
1831 ce7543633fef Slight typo in that last commit fixed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1830 diff changeset	4066 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	4067 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	4068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4069 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	4070 /* 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	4071 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	4072 /* 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	4073 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	4074 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	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 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	4077 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	4078 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	4079 }
1832 cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1831 diff changeset	4080 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	4081 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	4082 {
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	4083 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	4084 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4085 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	4086 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	4087 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4091 * 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	4092 * Parameters:
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 * 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	4094 * 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	4095 * 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	4096 * (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	4097 * 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	4098 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4099 HWND dw_bitmapbutton_new_from_data(char text, unsigned long id, char data, 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	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 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	4102 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	4103 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	4104
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 DW_MUTEX_LOCK;
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 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	4107 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	4108
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 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	4110 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4111 dw_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	4112 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	4113 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	4114 }
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 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	4116 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	4117 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4118 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	4119 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4120 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	4121 DW_MUTEX_UNLOCK;
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 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	4123 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4124
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4125 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4126 * 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	4127 * Parameters:
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 * 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	4129 * 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	4130 */
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 HWND dw_spinbutton_new(char *text, 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	4132 {
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 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	4134 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4135 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4136
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4137 DW_MUTEX_LOCK;
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	4138 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	4139 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	4140 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	4141 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	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_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	4144 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	4145 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	4146 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	4147 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	4148 DW_MUTEX_UNLOCK;
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4152 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4153 * 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	4154 * Parameters:
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 * 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	4156 * 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	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 HWND dw_radiobutton_new(char *text, 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	4159 {
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 /* 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	4161 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4162 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	4163
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 DW_MUTEX_LOCK;
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 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	4166 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4167 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	4168
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4169 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	4170 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	4171 DW_MUTEX_UNLOCK;
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 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	4173 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4174
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4175 /*
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 * 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	4177 * Parameters:
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 * 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	4179 * 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	4180 * 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	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 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	4183 {
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 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	4185 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	4186 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	4187
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4188 DW_MUTEX_LOCK;
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 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	4190 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	4191 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	4192 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	4193 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	4194 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	4195 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	4196 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	4197 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4199 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4200
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4201 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4202 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	4203 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	4204 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4205
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4206 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4207 * 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	4208 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 * 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	4210 * 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	4211 * 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	4212 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4213 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	4214 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4215 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	4216 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	4217 int _locked_by_me = FALSE;
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4218 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4219 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4220 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4221
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4222 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4223 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4224 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4225 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4226 #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	4227 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	4228 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	4229 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4230 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4231 #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	4232 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	4233 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	4234 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	4235 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	4236 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	4237 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4238 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4242 * 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	4243 * Parameters:
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 * 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	4245 */
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 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	4247 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4248 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	4249 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	4250
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 DW_MUTEX_LOCK;
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 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	4253 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	4254 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	4255 DW_MUTEX_UNLOCK;
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 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	4257 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4260 * 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	4261 * Parameters:
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 * 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	4263 * 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	4264 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4265 HWND dw_checkbox_new(char *text, 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	4266 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4267 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	4268 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	4269
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4270 DW_MUTEX_LOCK;
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 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	4272 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	4273 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	4274 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	4275 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	4276 DW_MUTEX_UNLOCK;
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 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	4278 }
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 * 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	4282 * Parameters:
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 * 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	4284 * 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	4285 */
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 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	4287 {
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 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	4289 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	4290 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	4291 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	4292 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	4293 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	4294
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4295 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4296 if(!(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	4297 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4298 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4299 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	4300 }
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 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	4302 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	4303 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	4304 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	4305
775 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 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	4307 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	4308 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	4309 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	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 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	4312 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	4313 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	4314
775 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 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	4316 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	4317 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4318 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	4319 }
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 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	4321 {
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_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	4323 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4324 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	4325 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	4326 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	4327 DW_MUTEX_UNLOCK;
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 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	4329 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4330
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4331 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4332 * 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	4333 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4334 * 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	4335 * 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	4336 */
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 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	4338 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339 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	4340 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	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 DW_MUTEX_LOCK;
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 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	4344
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 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	4346 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4347 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	4348 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	4349 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	4350 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4351 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4352 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4353
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4354 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4355 * 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	4356 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4357 * 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	4358 * 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	4359 * (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	4360 * 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	4361 * 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	4362 * 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	4363 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4364 void dw_window_set_bitmap(HWND handle, unsigned long id, char *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	4365 {
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 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	4367 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	4368 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	4369 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	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 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	4372 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	4373
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 DW_MUTEX_LOCK;
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 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	4376 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	4377 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	4378 {
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	4379 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	4380
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4381 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	4382 {
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 DW_MUTEX_UNLOCK;
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 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	4385 }
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 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	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 /* 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	4390 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	4391 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4392 /* 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	4393 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	4394 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4395 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	4396 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	4397 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	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 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	4400 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	4401 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4402 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4403 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	4404 {
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;
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 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	4410 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4411
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4412 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	4413 {
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 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	4415 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4416 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	4417 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4418 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4419 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	4420 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4421 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4422 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	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 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	4425 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4426 }
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 }
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 /*
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 * 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	4432 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4433 * 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	4434 * 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	4435 * (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	4436 * 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	4437 * 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	4438 * 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	4439 * 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	4440 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4441 void dw_window_set_bitmap_from_data(HWND handle, unsigned long id, char *data, 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	4442 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4443 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	4444 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	4445 char *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	4446 FILE *fp;
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
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 if (!id && !data)
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 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	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 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	4452 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	4453 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4454 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4455 * 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	4456 * 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	4457 */
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 file = tmpnam( NULL );
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 fp = fopen( file, "wb" );
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 if ( fp )
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 {
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 fwrite( data, len, 1, fp );
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 fclose( fp );
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 }
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 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	4466 {
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 DW_MUTEX_UNLOCK;
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 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	4469 }
1097 8e9db23a8c31 Fixed icons from data by merging tmp and pixbuf together in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1096 diff changeset	4470 tmp = 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	4471 /* remove our temporary 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	4472 unlink (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	4473 }
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4474 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	4475 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	4476
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 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	4478 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4479 if ( GTK_IS_BUTTON(handle) )
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4480 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4481 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	4482 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4483 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4484 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	4485 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4486 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4487 else
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4488 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4489 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), tmp);
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4490 }
775 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 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4493 }
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 /*
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 * 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	4497 * Parameters:
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 * 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	4499 * 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	4500 */
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 void dw_window_set_text(HWND handle, char *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	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 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	4504 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	4505
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 DW_MUTEX_LOCK;
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 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	4508 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	4509 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	4510 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	4511 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	4512 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	4513 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	4514 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	4515 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	4516 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4517 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	4518 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4519 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	4520 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	4521 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	4522 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4523 /*
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 * 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	4525 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4526 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	4527 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	4528 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	4529 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	4530 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4535 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4536 * 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	4537 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4538 * 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	4539 * 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	4540 */
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4541 void API dw_window_set_tooltip(HWND handle, char *bubbletext)
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4542 {
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4543 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	4544
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4545 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	4546 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	4547 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	4548 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	4549 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	4550 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	4551 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4552
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4553 /*
775 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 * 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	4555 * Parameters:
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 * 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	4557 * 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	4558 * 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	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 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	4561 {
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4562 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	4563 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	4564
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4565 DW_MUTEX_LOCK;
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 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	4567 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	4568 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	4569 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	4570 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	4571 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	4572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4573 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	4574 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	4575 }
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
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 * 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	4579 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4580 * 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	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 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	4583 {
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 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	4585
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4586 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4587 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	4588 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4589 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4590
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4591 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4592 * 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	4593 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4594 * 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	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 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	4597 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4598 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	4599
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4600 DW_MUTEX_LOCK;
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 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	4602 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4603 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4604
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4605 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4606 * 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	4607 * Parameters:
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 * 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	4609 * 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	4610 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4611 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	4612 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4613 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	4614 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	4615
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4616 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4617 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	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 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	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 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	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 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	4624 {
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	4625 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	4626 {
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 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	4628 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	4629 DW_MUTEX_UNLOCK;
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 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	4631 }
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 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	4634 }
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 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	4636 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	4637 DW_MUTEX_UNLOCK;
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 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	4639 }
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
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 /*
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 * 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	4643 * Parameters:
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 * 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	4645 * 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	4646 * 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	4647 */
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 unsigned int dw_mle_import(HWND handle, char *buffer, int 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	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 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	4651 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	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 DW_MUTEX_LOCK;
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(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	4655 {
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 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	4657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4658 if(tmp && 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	4659 {
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 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	4661 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	4662
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4663 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	4664 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	4665 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	4666 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	4667 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	4668 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4669 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4670 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4671 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	4672 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4673
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4674 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4675 * 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	4676 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4677 * 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	4678 * 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	4679 * 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	4680 * 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	4681 */
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 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	4683 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4684 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	4685 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	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 DW_MUTEX_LOCK;
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 /* 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	4689 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	4690 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	4691 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	4692 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4693 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	4694
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4695 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	4696 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4697 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	4698 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	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 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	4701 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	4702 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	4703 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	4704 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	4705 {
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 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	4707 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	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 }
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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	4716 * Parameters:
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 * 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	4718 * 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	4719 * 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	4720 */
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 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	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 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	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 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	4726 *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	4727 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	4728 *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	4729
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 DW_MUTEX_LOCK;
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 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	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 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	4734
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 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	4736 {
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 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	4738
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4739 if(bytes)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4740 *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	4741 if(lines)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4742 *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	4743 }
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 }
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 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	4750 * Parameters:
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 * 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	4752 * 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	4753 * 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	4754 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 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	4756 {
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 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	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 DW_MUTEX_LOCK;
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 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	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 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	4763
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4764 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	4765 {
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 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	4767 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	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 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	4770 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	4771 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	4772 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	4773 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4774 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4775 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4778 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4779 * 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	4780 * Parameters:
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 * 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	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 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	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 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	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 DW_MUTEX_LOCK;
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 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	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 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	4791
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 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	4793 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4794 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	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 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	4797 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	4798 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4799 }
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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	4805 * Parameters:
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 * 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	4807 * 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	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_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	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
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 DW_MUTEX_LOCK;
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 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	4815 {
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 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	4817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818 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	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 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	4821 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	4822 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	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 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	4825 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	4826 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	4827 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	4828 {
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 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	4830 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	4831 }
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 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	4833 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	4834 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	4835 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	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 * 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	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.
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 * 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	4846 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4847 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	4848 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4849 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	4850
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4851 DW_MUTEX_LOCK;
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(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	4853 {
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 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	4855
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4856 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	4857 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	4858 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4860 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4861
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 /*
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 * 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	4864 * Parameters:
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 * 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	4866 * 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	4867 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4868 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	4869 {
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 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	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_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4873 if(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	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 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	4876
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4877 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	4878 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	4879 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4880 DW_MUTEX_UNLOCK;
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
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 /*
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4884 * 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	4885 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4886 * 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	4887 * 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	4888 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4889 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	4890 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4891 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4892
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4893 /*
775 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 * 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	4895 * Parameters:
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 * 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	4897 * 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	4898 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4899 void dw_mle_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	4900 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4901 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4902
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4903 DW_MUTEX_LOCK;
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 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	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 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	4907
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 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	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 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	4911 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	4912 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	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 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	4915 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	4916 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	4917 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4918 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	4919 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	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 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	4922 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	4923 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	4924 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	4925 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	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 }
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 DW_MUTEX_UNLOCK;
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 /*
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 * 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	4933 * Parameters:
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 * 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	4935 * 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	4936 * 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	4937 * 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	4938 */
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 int dw_mle_search(HWND handle, char *text, int point, 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	4940 {
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 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	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 DW_MUTEX_LOCK;
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 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	4945 {
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 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	4947
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 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	4949 {
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 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	4951 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	4952
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4953 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	4954 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	4955 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	4956 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	4957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4958 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4959 DW_MUTEX_UNLOCK;
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 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	4961 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4962
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4963 /*
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 * 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	4965 * Parameters:
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 * 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	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 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	4969 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4970 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4971
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4972 /*
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 * 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	4974 * Parameters:
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 * 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	4976 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4977 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	4978 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4979 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4980
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	4981 /* 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	4982 * 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	4983 */
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	4984 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	4985 {
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	4986 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	4987 {
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	4988 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	4989 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	4990 }
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	4991 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	4992 }
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	4993
775 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 * 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	4996 * Parameters:
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 * 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	4998 * 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	4999 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5000 void dw_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	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 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	5003
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5004 DW_MUTEX_LOCK;
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	5005 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	5006 {
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	5007 /* 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	5008 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	5009 {
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	5010 /* 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	5011 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	5012 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	5013 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	5014 }
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	5015 }
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	5016 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	5017 {
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	5018 /* 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	5019 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	5020 /* 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	5021 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	5022 }
775 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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5024 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5025
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5026 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5027 * 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	5028 * Parameters:
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 * 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	5030 */
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 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	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 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	5034 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	5035
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 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	5037 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	5038
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5039 DW_MUTEX_LOCK;
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 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	5041 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	5042 {
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 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	5044 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	5045
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5046 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	5047 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	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 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	5050 }
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 DW_MUTEX_UNLOCK;
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 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	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 /*
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 * 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	5057 * Parameters:
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 * 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	5059 * 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	5060 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5061 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	5062 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5063 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	5064 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	5065
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5066 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	5067 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	5068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 DW_MUTEX_LOCK;
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 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	5071 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	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 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	5074
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5075 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	5076 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	5077 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5078 gtk_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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5081 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5082
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5083 /*
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 * 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	5085 * Parameters:
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 * 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	5087 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5088 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	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 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	5091 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	5092
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 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	5094 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	5095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5096 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097 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	5098 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	5099 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	5100 DW_MUTEX_UNLOCK;
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 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	5102 }
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 /*
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 * 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	5106 * Parameters:
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 * 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	5108 * 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	5109 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5110 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	5111 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5112 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	5113 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	5114
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5115 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	5116 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	5117
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5118 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5119 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	5120 if(adjustment)
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5121 {
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5122 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	5123 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	5124 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	5125 }
775 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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5128
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 /*
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 * 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	5131 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5132 * 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	5133 * 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	5134 * 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	5135 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5136 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	5137 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5138 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	5139 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	5140
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5141 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	5142 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	5143
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5144 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5145 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	5146 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	5147 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5148 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	5149 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	5150 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	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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	5157 * Parameters:
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 * 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	5159 * 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	5160 */
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 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	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 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	5164
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 DW_MUTEX_LOCK;
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 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	5167 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	5172 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 * 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	5174 * 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	5175 * 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	5176 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5177 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	5178 {
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 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	5180 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	5181 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	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 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	5184 DW_MUTEX_LOCK;
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 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	5186 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	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 * 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	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 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	5191 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	5192 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5194
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5195 /*
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 * 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	5197 * Parameters:
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 * 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	5199 * 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	5200 */
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 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	5202 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5203 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	5204
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5205 DW_MUTEX_LOCK;
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 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	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 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	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 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	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 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	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 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	5218 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	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 DW_MUTEX_LOCK;
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 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	5222 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5223
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5224 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	5225 }
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
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 /*
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 * 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	5229 * Parameters:
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 * 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	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 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	5233 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5234 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	5235 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	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 DW_MUTEX_LOCK;
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 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	5239 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5240
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5241 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	5242 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5243
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5244 /*
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 * 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	5246 * Parameters:
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 * 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	5248 * 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	5249 */
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 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	5251 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5252 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	5253
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 DW_MUTEX_LOCK;
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 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	5256 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5257 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5258
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5259 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5260 * 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	5261 * Parameters:
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 * 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	5263 * 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	5264 * 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	5265 * 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	5266 * 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	5267 * 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	5268 */
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 HTREEITEM dw_tree_insert_after(HWND handle, HTREEITEM item, char title, HICN icon, HTREEITEM parent, 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	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 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	5272 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	5273 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	5274 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	5275 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	5276 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	5277
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 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	5279 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	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 DW_MUTEX_LOCK;
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 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	5283 && 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	5284 (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	5285 {
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 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	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 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	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 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	5291 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	5292 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	5293 }
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5299 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 * 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	5301 * Parameters:
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 * 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	5303 * 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	5304 * 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	5305 * 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	5306 * 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	5307 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5308 HTREEITEM dw_tree_insert(HWND handle, char title, HICN icon, HTREEITEM parent, 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	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 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	5311 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	5312 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	5313 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	5314 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	5315 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	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 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	5318 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	5319
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 DW_MUTEX_LOCK;
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 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	5322 && 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	5323 (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	5324 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5325 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	5326
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5327 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	5328
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5329 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	5330 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	5331 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	5332 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5333 DW_MUTEX_UNLOCK;
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
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 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	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 /*
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 * 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	5340 * Parameters:
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 * 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	5342 * 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	5343 * 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	5344 * 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	5345 */
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 void dw_tree_item_change(HWND handle, HTREEITEM item, char *title, 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	5347 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5348 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	5349 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	5350 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	5351 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	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 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	5354 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	5355
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 DW_MUTEX_LOCK;
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 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	5358 && 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	5359 (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	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 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	5362
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363 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	5364 }
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 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	5370 * Parameters:
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 * 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	5372 * 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	5373 * 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	5374 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5375 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	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 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	5378 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	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 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	5382 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	5383
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 DW_MUTEX_LOCK;
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 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	5386 && 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	5387 (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	5388 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	5389 DW_MUTEX_UNLOCK;
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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5392 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5393 * 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	5394 * Parameters:
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 * 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	5396 * 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	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 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	5399 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5400 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	5401 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	5402 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	5403 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	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 \|\| !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	5406 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	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 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
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 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	5412 (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	5413 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	5414 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5415 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5416 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5417 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5418 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5419 }
775 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 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	5426 * Parameters:
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 * 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	5428 * 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	5429 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5430 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	5431 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5432 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	5433 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	5434 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	5435 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	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 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	5438 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	5439
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5440 DW_MUTEX_LOCK;
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 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	5442
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 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	5444 (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	5445 {
1900 969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5446 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5447
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5448 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	5449 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	5450 }
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 DW_MUTEX_UNLOCK;
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 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	5453 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5454
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5455 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5456 * 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	5457 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5458 * handle: Handle to the 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	5459 * 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	5460 */
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 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	5462 {
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 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	5464 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	5465 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	5466 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	5467
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5468 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	5469 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	5470
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5471 DW_MUTEX_LOCK;
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 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	5473 && 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	5474 (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	5475 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	5476 DW_MUTEX_UNLOCK;
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 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	5478 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5479
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 /*
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 * 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	5482 * Parameters:
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 * 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	5484 * 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	5485 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5486 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	5487 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5488 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5489 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	5490 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	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 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	5493 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	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 DW_MUTEX_LOCK;
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 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	5497 && 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	5498 (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	5499 {
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 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	5501 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	5502
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5503 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	5504 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	5505 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	5506 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5507 DW_MUTEX_UNLOCK;
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 }
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
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 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	5511 {
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 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	5513 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	5514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5515 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	5516 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	5517 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	5518 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	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 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	5521 {
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 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	5523 _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	5524 } 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	5525 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5526 }
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
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 /*
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 * 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	5530 * Parameters:
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 * 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	5532 */
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 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	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 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	5536 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	5537 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	5538
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5539 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	5540 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	5541
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5542 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 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	5544 && 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	5545 (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	5546 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5547 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	5548
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 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	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 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	5552 _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	5553 } 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	5554 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5555 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	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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	5562 * Parameters:
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 * 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	5564 * 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	5565 */
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 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	5567 {
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 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	5569 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	5570 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	5571
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 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	5573 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	5574
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5575 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 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	5577 && 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	5578 (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	5579 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5580 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	5581 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	5582 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	5583 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5584 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5585 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5586
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 * 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	5589 * Parameters:
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 * 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	5591 * 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	5592 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5593 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	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 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	5596 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	5597 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	5598
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(!handle)
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 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	5601
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602 DW_MUTEX_LOCK;
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 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	5604 && 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	5605 (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	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 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	5608 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	5609 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	5610 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5612 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5613
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614 /*
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 * 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	5616 * Parameters:
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 * 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	5618 * 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	5619 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5620 void dw_tree_item_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	5621 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5622 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5623 GtkTreeStore *store;
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 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	5625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5626 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5629 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5630 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5631 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5632 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5633 {
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 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	5635 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	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 DW_MUTEX_UNLOCK;
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
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5640 #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	5641
775 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 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	5643 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5644 int z;
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	5645 char numbuf[25];
775 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 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	5647 GtkListStore *store;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5648 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	5649 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	5650 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	5651 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	5652 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	5653
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5654 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	5655 /* 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	5656 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	5657 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	5658
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5659 /* 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	5660 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	5661 /* 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	5662 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	5663 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	5664 /* 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	5665 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	5666 {
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	5667 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	5668 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5669 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	5670 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	5671 }
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	5672 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	5673 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5674 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	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 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	5677 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5678 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	5679 }
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 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	5681 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5682 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	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 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	5685 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5686 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	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 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	5689 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5690 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	5691 }
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 /* 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	5694 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	5695 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	5696 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	5697 /* 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	5698 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	5699 {
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	5700 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	5701 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	5702 col = gtk_tree_view_column_new();
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5703 rend = NULL;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5704 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	5705
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	5706 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	5707 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5708 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	5709 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	5710 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	5711 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	5712 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	5713 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	5714 }
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	5715 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	5716 {
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	5717 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	5718 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	5719 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	5720 }
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 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	5722 {
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 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	5724 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	5725 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	5726 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	5727 }
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 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	5729 {
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 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	5731 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	5732 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	5733 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	5734 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5735 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	5736 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5737 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	5738 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	5739 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	5740 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	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 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	5743 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5744 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	5745 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	5746 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	5747 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	5748 }
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	5749 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	5750 params[2] = tree;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5751 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	5752 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	5753 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5754 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5755 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	5756 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5757 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	5758 }
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5759 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5760 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5761 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	5762 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5763 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	5764 }
775 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 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	5766 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5767 /* 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	5768 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	5769 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	5770 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	5771 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	5772 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	5773 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5774 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	5775 }
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 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	5777 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5778 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	5779 }
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	5780 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	5781 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	5782 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	5783 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	5784 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	5785 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	5786 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5787
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5788 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5789 * 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	5790 * Parameters:
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 * 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	5792 * 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	5793 * 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	5794 * 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	5795 * 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	5796 * (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	5797 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5798 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	5799 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5800 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	5801 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5802
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 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5804 * 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	5805 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5806 * 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	5807 * 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	5808 */
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5809 void API dw_filesystem_set_column_title(HWND handle, char *title)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5810 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5811 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	5812
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5813 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	5814 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5815
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5816 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5817 * 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	5818 * Parameters:
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 * 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	5820 * 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	5821 * 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	5822 * 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	5823 */
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 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	5825 {
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	5826 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	5827 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	5828 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	5829
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5830 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	5831 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	5832
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 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	5834 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	5835
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	5836 _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	5837
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5838 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5839 {
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5840 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	5841 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5842 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5843 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	5844 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	5845 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	5846 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5847
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 /*
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 * 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	5850 * Parameters:
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 * 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	5852 * 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	5853 * 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	5854 * 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	5855 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5856 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	5857 {
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5858 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	5859 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5860
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	5861 /* 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	5862 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	5863 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5864 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5865 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5866 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	5867 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	5868
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5869 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	5870 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5871 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	5872 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	5873 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	5874 }
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	5875 }
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	5876 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	5877 }
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	5878
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5879 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5880 * 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	5881 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5882 * 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	5883 * 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	5884 * (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	5885 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5886 HICN API dw_icon_load_from_file(char *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	5887 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5888 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	5889 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	5890 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	5891 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	5892
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 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	5894 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	5895
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5896 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	5897
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 /* 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	5899 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	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 /* 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	5902 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	5903 {
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 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	5905 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	5906 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	5907 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5908 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	5909 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	5910 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5912 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	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 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	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 }
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
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 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	5919 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	5920 DW_MUTEX_UNLOCK;
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 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	5922 }
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
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 * 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	5926 * Parameters:
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 * 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	5928 * 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	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 HICN API dw_icon_load_from_data(char *data, 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	5931 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5932 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	5933 char *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	5934 FILE *fp;
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5935 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	5936
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5937 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5938 * 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	5939 * 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	5940 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5941 file = tmpnam( NULL );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5942 fp = fopen( file, "wb" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5943 if ( fp )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5944 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5945 fwrite( data, len, 1, fp );
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 fclose( fp );
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 }
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 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	5949 {
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 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	5951 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5952 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	5953 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	5954 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5955 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	5956 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5957
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5958 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5959 * 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	5960 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5961 * 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	5962 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5963 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	5964 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	5965 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	5966
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5967 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	5968 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5969 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	5970 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5972
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5973 /*
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 * 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	5975 * Parameters:
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 * 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	5977 * 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	5978 */
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 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	5980 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5981 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	5982 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	5983 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	5984 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	5985
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5986 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	5987 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	5988
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5989 /* 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	5990 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	5991 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	5992
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5993 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	5994 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5995 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	5996
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	5997 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	5998
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	5999 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	6000 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6001 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	6002 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6003 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	6004 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	6005 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6006 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	6007 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	6008 }
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
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 /*
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 * 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	6012 * 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	6013 */
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6014 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	6015 {
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	6016 char numbuf[21], 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	6017 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	6018 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	6019 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	6020 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	6021
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6022 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	6023 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	6024
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6025 /* 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	6026 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	6027 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	6028
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6029 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	6030 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6031 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6032
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	6033 snprintf(numbuf, 20, "_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	6034 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	6035 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	6036 {
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	6037 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	6038 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6039
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6040 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	6041 {
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	6042 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	6043 {
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	6044 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	6045 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	6046 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	6047 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	6048
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6049 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	6050 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	6051 }
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	6052 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	6053 {
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	6054 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	6055 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	6056
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6057 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	6058 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6059 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	6060 {
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	6061 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	6062 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	6063 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6064 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	6065 {
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	6066 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	6067
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6068 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	6069 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6070 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	6071 {
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	6072 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	6073 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6074 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	6075 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	6076
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6077 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	6078 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	6079 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	6080 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	6081
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6082 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	6083 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6084 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	6085 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6086 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	6087 {
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	6088 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	6089 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6090 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	6091 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	6092
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6093 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	6094 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	6095 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	6096 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	6097
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6098 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	6099 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6100 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	6101 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6102 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6103 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6104 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	6105 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6106
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6107 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6108 * 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	6109 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6110 * 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	6111 * 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	6112 * 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	6113 * 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	6114 * 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	6115 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6116 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	6117 {
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	6118 _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	6119 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6120
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6121 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6122 * 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	6123 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6124 * 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	6125 * 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	6126 * 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	6127 * 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	6128 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6129 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	6130 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6131 _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	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 * 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	6136 * Parameters:
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 * 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	6138 * 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	6139 * 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	6140 * 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	6141 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6142 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	6143 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6144 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	6145 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6146
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6147 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6148 * 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	6149 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6150 * 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	6151 * 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	6152 * 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	6153 * 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	6154 * 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	6155 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6156 void API dw_filesystem_change_file(HWND handle, int row, char *filename, 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	6157 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6158 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	6159 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6160
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6161 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6162 * 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	6163 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6164 * 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	6165 * 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	6166 * 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	6167 * 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	6168 * 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	6169 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6170 void dw_filesystem_set_file(HWND handle, void pointer, int row, char filename, 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	6171 {
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 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	6173
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	6174 _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	6175 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6176
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6177 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6178 * 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	6179 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6180 * 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	6181 * 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	6182 * 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	6183 * 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	6184 * 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	6185 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6186 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	6187 {
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	6188 _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	6189 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6191 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6192 * 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	6193 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6194 * 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	6195 * 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	6196 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6197 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	6198 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6199 char numbuf[20];
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	6200 int flag, rc = 0;
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	6201 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	6202 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	6203
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6204 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	6205 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	6206 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	6207 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6208 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6209 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	6210 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6211
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	6212 snprintf(numbuf, 20, "_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	6213 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	6214
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6215 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	6216 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	6217 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	6218 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	6219 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	6220 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	6221 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	6222 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	6223 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	6224 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	6225 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	6226 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	6227 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6228 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	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 * 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	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 * 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	6236 */
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 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	6238 {
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	6239 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	6240 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6242 /*
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6243 * 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	6244 * Parameters:
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6245 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6246 * 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	6247 * 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	6248 * 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	6249 * 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	6250 */
1291 b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1289 diff changeset	6251 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	6252 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	6253 #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	6254 GtkWidget *cont;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6255 int _locked_by_me = FALSE;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6256 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6257 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	6258
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6259 /* 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	6260 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	6261 {
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6262 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	6263 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	6264 else
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6265 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	6266 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6267 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	6268 #endif
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6269 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6270
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6271 /*
775 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 * 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	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 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	6275 * 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	6276 * 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	6277 */
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 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	6279 {
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6280 GtkWidget *cont;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6281 int _locked_by_me = FALSE;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6282
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6283 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6284 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	6285
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6286 /* 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	6287 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	6288 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6289 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	6290
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6291 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	6292 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6293 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	6294 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6295 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6296 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	6297 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6298
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	6299 /* 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	6300 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	6301 {
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	6302 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	6303 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	6304 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	6305
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6306 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	6307 /* 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	6308 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	6309 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	6310
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6311 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6312 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6313 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6314
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6315 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6316 {
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	6317 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	6318 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6319
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6320 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	6321 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6322 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	6323 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6324 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6325 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	6326 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6327
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6328 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6329 * 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	6330 * 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	6331 * 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	6332 * 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	6333 * 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	6334 */
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	6335 void dw_container_set_row_title(void pointer, int row, char title)
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	6336 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6337 _dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_STRING, 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	6338 }
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	6339
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	6340 /*
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	6341 * 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	6342 * 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	6343 * 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	6344 * 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	6345 * 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	6346 */
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	6347 void dw_container_change_row_title(HWND handle, int row, char *title)
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	6348 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6349 _dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_STRING, title);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6350 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6351
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6352 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6353 * 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	6354 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6355 * 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	6356 * 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	6357 * 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	6358 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6359 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	6360 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6361 _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	6362 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6363
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6364 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6365 * 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	6366 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6367 * 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	6368 * 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	6369 * 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	6370 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6371 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	6372 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6373 _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	6374 }
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	6375
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	6376 /*
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	6377 * 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	6378 * 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	6379 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6380 * 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	6381 * 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	6382 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6383 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	6384 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6385 /* 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	6386 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6387
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6388 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6389 * 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	6390 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6391 * 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	6392 * 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	6393 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6394 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	6395 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6396 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6397 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	6398 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	6399
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6400 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	6401 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	6402
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6403 /* 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	6404 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	6405 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	6406
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6407 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6408 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6409 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6410 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	6411
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	6412 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	6413
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6414 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	6415 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6416 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	6417 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	6418 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6419
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6420 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	6421 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6422 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6423 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6424
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6425 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	6426 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6427 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	6428 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6429
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6430 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6431 * 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	6432 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6433 * 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	6434 * 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	6435 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6436 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	6437 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6438 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6439 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	6440 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	6441
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6442 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	6443 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	6444
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6445 /* 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	6446 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	6447 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	6448
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6449 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6450 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6451 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	6452 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	6453
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6454 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	6455 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6456 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	6457 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6458
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6459 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6460 * 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	6461 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6462 * 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	6463 * 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	6464 * 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	6465 * 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	6466 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6467 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	6468 {
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6469 GtkWidget *cont;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6470 int _locked_by_me = FALSE;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6471
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6472 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6473 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	6474
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6475 /* 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	6476 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	6477 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	6478 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	6479
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6480 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6481 {
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	6482 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	6483 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6484 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6485 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	6486 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6487
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6488 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6489 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6490 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6491 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6492 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6493 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6494
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6495 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6496
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6497 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6498 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6499 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6500 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6501 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6502 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6503 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6504 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6505 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6506 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6507 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6508 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6509 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6510 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6511 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6512 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6513 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6514 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6515 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6516 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6517 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6518 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6519 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6520 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6521 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6522 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6523 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6524 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6525 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6526 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6527 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6528 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6529 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6530 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6531 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6532 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	6533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6535 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6536 * 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	6537 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6538 * 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	6539 * 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	6540 * 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	6541 * 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	6542 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6543 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	6544 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6545 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6546 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	6547 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	6548 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	6549 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	6550
782 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_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6552 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	6553
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6554 /* 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	6555 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	6556 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	6557
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6558 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6559 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6560 /* 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	6561 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	6562 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6563 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	6564 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	6565 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6566 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6567 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	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 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6570 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6571 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	6572
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6573 if(indices)
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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6576
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6577 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	6578 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6579 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	6580 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	6581 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6582 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6583 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6584 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	6585 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	6586 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6587 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6588 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	6589 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6590 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6591
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6592 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	6593 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6594 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6595 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6596
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6597 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	6598 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6599 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	6600 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6601 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	6602 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6603 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6604 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6605 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6606 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6607
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6608 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	6609 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6610 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	6611 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	6612 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6613 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6614 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6615 /* 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	6616 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	6617 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6618 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6619 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6620 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6621 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6622 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	6623 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	6624 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6626 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6627 * 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	6628 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6629 * 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	6630 * 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	6631 * 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	6632 * 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	6633 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6634 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	6635 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6636 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6637 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	6638 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	6639 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	6640 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	6641
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6642 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6643 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6644
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6645 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6646 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6647 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6648
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6649 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6650 {
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	6651 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	6652 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	6653
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6654 /* 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	6655 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	6656 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6657 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	6658 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	6659
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6660 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6661 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6662 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	6663
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6664 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6665 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6666 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	6667
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6668 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6669 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6670 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6671
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6672 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	6673 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6674 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	6675 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	6676 }
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 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6679 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	6680 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	6681 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6682 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6683 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	6684 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6685 /* 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	6686 * 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	6687 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6688 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6689 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6690 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6691 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6692 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6693
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6694 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	6695 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6696 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	6697 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	6698 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6699 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6700 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6701 /* 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	6702 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	6703 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6704 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6705 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6706 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6707 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6708 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	6709 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	6710 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6711
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6712 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	6713 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6714 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	6715 void *thisdata;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6716 int retval = FALSE;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6717
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6718 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	6719 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6720 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	6721 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6722 /* 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	6723 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	6724 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	6725 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6726 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6727 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	6728 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6729 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6730 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6731 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6732 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6733 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	6734 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6735
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6736 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	6737 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6738 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6739 GtkListStore *store = NULL;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6740 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	6741
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6742 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6743 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	6744
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6745 /* 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	6746 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	6747 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	6748
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6749 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6750 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6751 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6752
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6753 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	6754 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6755 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	6756
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6757 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6758 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6759 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	6760 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	6761 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6762 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6763 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6764 DW_MUTEX_UNLOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6765 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6766
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6767 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6768 * 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	6769 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6770 * 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	6771 * 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	6772 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6773 void dw_container_cursor(HWND handle, char *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	6774 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6775 _dw_container_cursor(handle, text, TRUE);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6776 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6777
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6778 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6779 * 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	6780 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6781 * 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	6782 * 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	6783 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6784 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	6785 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6786 _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	6787 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6788
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6789 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	6790 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6791 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6792 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	6793 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	6794
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6795 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	6796 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	6797
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6798 /* 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	6799 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	6800 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	6801
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6802 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6803 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6804 GtkTreeIter iter;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6805 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	6806
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6807 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	6808 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6809 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	6810 rows--;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6811 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6812
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6813 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	6814 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6815 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	6816 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6818 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6819 * 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	6820 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6821 * 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	6822 * 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	6823 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6824 void dw_container_delete_row(HWND handle, char *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	6825 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6826 _dw_container_delete_row(handle, text, TRUE);
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6827 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6828
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6829 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6830 * 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	6831 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6832 * 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	6833 * 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	6834 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6835 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	6836 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6837 _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	6838 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6839
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6840 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6841 * 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	6842 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6843 * 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	6844 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6845 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	6846 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6847 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6848 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	6849
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6850 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	6851 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	6852
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6853 /* 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	6854 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	6855 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	6856 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	6857 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6858
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6859 /* 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	6860 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	6861 {
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6862 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6863 long x, y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6864 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	6865
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6866 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	6867
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6868 event.button = button;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6869 event.x = x;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6870 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	6871
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6872 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	6873 }
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6874
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6875 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6876 * 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	6877 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6878 * 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	6879 * 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	6880 * 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	6881 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6882 void dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6883 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6884 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6885 GdkPixbuf *pixbuf;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6886 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6887
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6888 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6889 pixbuf = _find_pixbuf(icon, NULL, NULL);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6890 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6891 if(bubbletext)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6892 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6893 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	6894 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	6895 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	6896 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	6897 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6898
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6899 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6900 * 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	6901 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6902 * 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	6903 * 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	6904 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6905 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	6906 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6907 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6908 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6909
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6910 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6911 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	6912 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6913 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	6914 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6915
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6916 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6917 * 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	6918 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6919 * 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	6920 * 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	6921 * 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	6922 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6923 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	6924 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6925 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	6926 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	6927
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6928 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6929 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	6930 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	6931 \| 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	6932 \| 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	6933 \| 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	6934 \| 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	6935 \| 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	6936 \| 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	6937 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	6938 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	6939 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	6940 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	6941 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	6942 DW_MUTEX_UNLOCK;
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 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	6944 }
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
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6946 /* 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	6947 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	6948 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6949 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	6950 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6951 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	6952 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	6953 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6954 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	6955 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	6956 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	6957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6958
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6959 /* 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	6960 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6961 * 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	6962 * 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	6963 * 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	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 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	6966 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6967 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	6968 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	6969
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6970 *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	6971 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6972
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6973 /* 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	6974 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6975 * 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	6976 * 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	6977 * 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	6978 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6979 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	6980 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6981 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	6982
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6983 if(value == DW_CLR_DEFAULT)
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6984 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6985 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6986 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6987 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	6988 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6989 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6990 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6991 else
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6992 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6993 GdkRGBA color = _internal_color(value);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6994
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6995 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	6996 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6997 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	6998 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	6999 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7000 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7001 }
775 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 }
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
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7004 #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	7005 /* 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	7006 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7007 * 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	7008 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7009 * 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	7010 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7011 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	7012 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7013 GtkColorChooser *cd;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7014 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	7015 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	7016 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	7017
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7018 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	7019 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	7020 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	7021 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	7022
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7023 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	7024
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7025 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	7026 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7027 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	7028 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	7029 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7030 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	7031 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	7032 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7033 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7034 #else
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7035 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	7036
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7037 /* 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	7038 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	7039 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7040 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	7041 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	7042 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	7043
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 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	7045 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	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 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	7048 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	7049 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	7050 _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	7051 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	7052 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	7053 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	7054 }
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
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 /* 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	7057 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	7058 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7059 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	7060 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	7061
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_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	7063 _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	7064 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	7065 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	7066 }
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
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 /* 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	7069 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7070 * 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	7071 * 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	7072 * 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	7073 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7074 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	7075 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7076 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	7077 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	7078 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	7079 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	7080 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	7081 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	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 DW_MUTEX_LOCK;
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
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 /* 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	7086 * 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	7087 */
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 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	7089 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7090 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7091 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	7092 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7093
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7094 _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	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 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	7097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7098 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	7099
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7100 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	7101 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	7102 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	7103 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	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 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	7106 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	7107 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	7108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7109 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	7110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7111 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	7112 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	7113 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	7114 DW_MUTEX_UNLOCK;
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 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	7116 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7117 #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	7118
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7119 /* 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	7120 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7121 * 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	7122 * 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	7123 * 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	7124 * 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	7125 */
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 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	7127 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7128 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	7129 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7130 #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	7131 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	7132 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7133 #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	7134
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7135 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7137 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7138 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	7139 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7140 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7141 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7142 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7143 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7144 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7145 #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	7146 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	7147 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	7148 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	7149 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7150 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	7151 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7152 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7153 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	7154 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	7155 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	7156 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7157 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	7158
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7159 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	7160 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	7161 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	7162 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7163 #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	7164 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	7165 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7166 /* 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	7167 * 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	7168 */
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	7169 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	7170 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	7171 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7172 #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	7173 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	7174 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7175 DW_MUTEX_UNLOCK;
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 }
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
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 /* 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	7179 * Parameters:
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 * 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	7181 * 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	7182 * 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	7183 * 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	7184 * 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	7185 * 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	7186 */
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 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	7188 {
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 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	7190 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7191 #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	7192 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	7193 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7194 #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	7195
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 DW_MUTEX_LOCK;
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 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7198 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7199 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	7200 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7201 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7202 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7203 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7204 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7205 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7206 #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	7207 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	7208 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	7209 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	7210 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7211 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	7212 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7213 }
775 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 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	7215 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	7216 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	7217 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7218 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	7219
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7220 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	7221 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	7222 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	7223 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	7224 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7225 #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	7226 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	7227 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7228 /* 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	7229 * 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	7230 */
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	7231 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	7232 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	7233 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7234 #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	7235 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	7236 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7237 DW_MUTEX_UNLOCK;
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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7240 /* 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	7241 * Parameters:
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 * 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	7243 * 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	7244 * 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	7245 * 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	7246 * 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	7247 * 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	7248 */
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	7249 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	7250 {
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 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	7252 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	7253 int z;
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);
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7282
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7283 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	7284 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	7285
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7286 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	7287 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	7288 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	7289 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	7290 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7291 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	7292 }
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	7293 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	7294 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	7295 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7296 #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	7297 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	7298 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7299 /* 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	7300 * 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	7301 */
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	7302 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	7303 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	7304 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7305 #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	7306 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	7307 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7308 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7309 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7310
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 /* 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	7312 * Parameters:
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 * 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	7314 * 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	7315 * 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	7316 * 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	7317 * 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	7318 * 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	7319 * 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	7320 */
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	7321 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	7322 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7323 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	7324 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7325 #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	7326 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	7327 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7328 #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	7329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7330 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7331 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7332 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7333 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	7334 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7335 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7336 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7337 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7338 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7339 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7340 #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	7341 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	7342 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	7343 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	7344 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7345 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	7346 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7347 }
775 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 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	7349 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	7350 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	7351 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7352 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	7353
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7354 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	7355 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	7356
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7357 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	7358 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	7359 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	7360 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	7361 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	7362 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	7363 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	7364 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	7365 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7366 #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	7367 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	7368 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7369 /* 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	7370 * 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	7371 */
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	7372 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	7373 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	7374 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7375 #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	7376 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	7377 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7378 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7379 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7380
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7381 /* 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	7382 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7383 * 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	7384 * 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	7385 * 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	7386 * 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	7387 * 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	7388 * 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	7389 * 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	7390 * 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	7391 * 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	7392 * 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	7393 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7394 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	7395 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7396 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	7397 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7398 #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	7399 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	7400 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7401 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7402
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7403 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	7404 if(handle)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7405 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7406 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	7407 /* 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	7408 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	7409 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7410 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	7411 return;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7412 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7413 #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	7414 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	7415 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	7416 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	7417 #else
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7418 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	7419 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7420 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7421 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	7422 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	7423 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7424 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7425 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	7426 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	7427 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	7428
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7429 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	7430 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	7431
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7432 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	7433 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	7434 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7435 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	7436 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	7437 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	7438 else
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7439 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7440 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	7441 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	7442 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	7443 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	7444 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	7445
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	7446 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	7447 }
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	7448 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	7449 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	7450 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7451 #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	7452 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	7453 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7454 /* 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	7455 * 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	7456 */
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	7457 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	7458 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	7459 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7460 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7461 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	7462 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7463 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	7464 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7465
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7466 /* 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	7467 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7468 * 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	7469 * 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	7470 * 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	7471 * 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	7472 * 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	7473 */
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 void dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *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	7475 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7476 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	7477 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	7478 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	7479 char tmpname, fontname = "monospace 10";
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7480 #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	7481 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	7482 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7483 #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	7484
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 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	7486 return;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7487
775 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 DW_MUTEX_LOCK;
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 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	7490 {
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7491 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	7492 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7493 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7494 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7495 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7496 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7497 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7498 #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	7499 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	7500 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	7501 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	7502 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7503 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	7504 #endif
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7505 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	7506 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	7507 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7508 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	7509 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7510 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7511 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7512 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	7513 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	7514 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	7515 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7516 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	7517 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7518 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	7519 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	7520 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7521 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	7522
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7523 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	7524 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7525 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	7526
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7527 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	7528 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7529 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	7530 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	7531
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7532 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	7533 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	7534
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7535 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	7536 /* 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	7537 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	7538 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7539 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	7540 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	7541 (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	7542 (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	7543 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	7544 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7545 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	7546 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7547 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	7548 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	7549 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7550 /* 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	7551 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	7552 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	7553
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7554 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	7555 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7556 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	7557 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7558 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	7559 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7560 #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	7561 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	7562 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7563 /* 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	7564 * 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	7565 */
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	7566 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	7567 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	7568 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7569 #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	7570 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	7571 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7572 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7573 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7574
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7575 /* 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	7576 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7577 * 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	7578 * 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	7579 * 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	7580 * 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	7581 * 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	7582 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7583 void dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char text, int width, int *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	7584 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7585 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	7586 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	7587 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	7588 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	7589
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 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	7591 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	7592
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 DW_MUTEX_LOCK;
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 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	7595 {
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 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	7597 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	7598 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7599 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	7600 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	7601 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7603 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	7604 {
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	7605 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	7606 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	7607 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	7608 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	7609 }
775 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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7611 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	7612 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	7613 {
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 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	7615
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616 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	7617 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7618 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	7619
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7620 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	7621 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7622 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	7623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7624 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	7625 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	7626 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	7627
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7628 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	7629 *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	7630 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	7631 *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	7632
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 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	7634 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7635 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	7636 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7637 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	7638 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7639 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	7640 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	7641 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7642 }
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
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 * 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	7646 * Parameters:
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 * 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	7648 * 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	7649 * 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	7650 * 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	7651 * 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	7652 * 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	7653 * 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	7654 * 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	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 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	7657 {
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 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	7659 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	7660
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7661 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	7662 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	7663
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7664 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	7665 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	7666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7667 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	7668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7669
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7670 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7671 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	7672 /* 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	7673 * 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	7674 */
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7675 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	7676 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	7677 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	7683 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7684 * 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	7685 * 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	7686 * 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	7687 * (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	7688 * 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	7689 * 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	7690 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7691 HPIXMAP dw_pixmap_new_from_file(HWND handle, char *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	7692 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7693 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	7694 HPIXMAP pixmap;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	7695 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	7696 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	7697 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	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 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	7700 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	7701
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7702 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	7703
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7704 /* 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	7705 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	7706 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7707 /* 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	7708 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	7709 {
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 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	7711 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	7712 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	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 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	7715 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	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 }
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 ( 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	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 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	7721 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	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 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7725 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7726 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	7727 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	7728 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	7729 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	7730 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	7731 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7732 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	7733 }
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 /*
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 * 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	7737 * Parameters:
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 * 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	7739 * 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	7740 * 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	7741 * (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	7742 * 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	7743 * 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	7744 */
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 HPIXMAP dw_pixmap_new_from_data(HWND handle, char *data, 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	7746 {
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 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	7748 char *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	7749 FILE *fp;
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 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	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 (!data \|\| !(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	7753 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	7754
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 DW_MUTEX_LOCK;
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 * 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	7758 * 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	7759 */
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 file = tmpnam( NULL );
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 fp = fopen( file, "wb" );
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 if ( fp )
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 {
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 fwrite( data, len, 1, fp );
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 fclose( fp );
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 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	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 DW_MUTEX_UNLOCK;
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 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	7771 }
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 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	7773 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	7774 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	7775 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	7776 /* remove our temporary 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	7777 unlink (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	7778 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	7779 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	7785 * Parameters:
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 * 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	7787 * 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	7788 * 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	7789 * 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	7790 * 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	7791 */
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 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	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 }
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
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 /*
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 * 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	7798 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7799 * 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	7800 * 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	7801 * 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	7802 * 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	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 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	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 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	7807 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	7808
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 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	7810 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	7811
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
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 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	7814 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	7815 DW_MUTEX_UNLOCK;
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 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	7817 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7819 /* 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	7820 * 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	7821 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7822 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	7823 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7824 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7825
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 /*
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7827 * 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	7828 * 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	7829 * 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	7830 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7831 * 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	7832 * 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	7833 * 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	7834 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7835 * 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	7836 */
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7837 int API dw_pixmap_set_font(HPIXMAP pixmap, char *fontname)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7838 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7839 if(pixmap && fontname && *fontname)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7840 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7841 char *oldfont = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7842 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	7843 _convert_font(pixmap->font);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7844 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7845 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7846 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7847 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7848 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7849 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7850
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7851 /*
775 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 * 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	7853 * Parameters:
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 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	7855 * 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	7856 */
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 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	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 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	7860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7861 DW_MUTEX_LOCK;
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 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	7863 cairo_surface_destroy(pixmap->image);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7864 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7865 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	7866 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	7867 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7869
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7870 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7871 * 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	7872 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7873 * 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	7874 * 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	7875 * 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	7876 * 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	7877 * 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	7878 * 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	7879 * 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	7880 * 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	7881 * 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	7882 * 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	7883 */
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7884 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	7885 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7886 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	7887 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7888
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7889 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7890 * 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	7891 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7892 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7893 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7894 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7895 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7896 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7897 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7898 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7899 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7900 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7901 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7902 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7903 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7904 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7905 * 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	7906 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7907 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	7908 {
775 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 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	7910 cairo_t *cr = NULL;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7911 int retval = DW_ERROR_GENERAL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7912 #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	7913 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	7914 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7915 #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	7916
1177 c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1161 diff changeset	7917 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	7918 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	7919
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 DW_MUTEX_LOCK;
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 if(dest)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7922 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7923 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	7924 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7925 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7926 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7927 DW_MUTEX_UNLOCK;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7928 return retval;
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7929 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7930 #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	7931 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	7932 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	7933 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	7934 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7935 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	7936 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7937 }
775 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 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	7939 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	7940
775 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 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	7942 {
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7943 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	7944
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7945 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7946 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7947 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7948 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7949 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7950 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7951
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7952 if(src)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7953 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	7954 else if(srcp)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7955 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	7956
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7957 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	7958 cairo_fill(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7959 #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	7960 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	7961 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7962 /* 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	7963 * 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	7964 */
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	7965 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	7966 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	7967 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	7968 #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	7969 cairo_destroy(cr);
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7970 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7971 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7972 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7973 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	7974 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7975
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7976 /*
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 * 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	7978 * Parameters:
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 * 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	7980 * 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	7981 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7982 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	7983 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 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	7985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7986 DW_MUTEX_LOCK;
1937 eb488c379969 Fixed a few deprecation warnings on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1933 diff changeset	7987 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	7988 DW_MUTEX_UNLOCK;
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 }
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 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	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 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	7994
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 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	7996 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7997 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	7998 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	7999 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8001
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8002 /* 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	8003 * Parameters:
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 * 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	8005 * 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	8006 * 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	8007 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8008 int dw_module_load(char name, 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	8009 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8010 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	8011 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	8012 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	8013
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8015 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8016 return -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	8017
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8018 if((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	8019 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	8020
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8021 /* 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	8022 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	8023
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8024 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	8025 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	8026
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8027 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	8028 _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	8029
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8030 *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	8031 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	8032 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033 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	8034 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	8035 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	8036 *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	8037 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8038
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8039 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	8040
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8041 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	8042 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8043
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8044 /* 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	8045 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8046 * 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	8047 * 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	8048 * 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	8049 * 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	8050 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8051 int dw_module_symbol(HMOD handle, char name, 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	8052 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8053 if(!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	8054 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	8055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8056 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	8057 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	8058
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8059 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	8060 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	8061 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8062
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 /* 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	8064 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8065 * 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	8066 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8067 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	8068 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8069 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	8070 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	8071 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	8072 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8074 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8075 * 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	8076 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8077 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	8078 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8079 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	8080
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8081 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	8082 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	8083 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8084
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8085 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8086 * 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	8087 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8088 * 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	8089 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8090 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	8091 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8092 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	8093 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8094 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	8095 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	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 /*
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 * 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	8101 * Parameters:
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 * 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	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_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	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 /* 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	8107 * 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	8108 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8109 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	8110 _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	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 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	8113
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 /* 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	8115 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	8116 _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	8117 }
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 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8120 * 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	8121 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8122 * 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	8123 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8124 * 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	8125 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8126 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	8127 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8128 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	8129 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	8130 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	8131 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8132
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8133 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8134 * 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	8135 * Parameters:
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 * 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	8137 */
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 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	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 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	8141 }
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 /*
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 * 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	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 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	8147 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8148 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	8149
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 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	8151 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	8152
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 /* 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	8154 * 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	8155 * 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	8156 */
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 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	8158 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	8159 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	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 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	8162 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	8163 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	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 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	8166 }
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
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 /*
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 * 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	8170 * Parameters:
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 * 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	8172 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8173 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	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(!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	8176 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	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 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	8179 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	8180 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	8181 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	8182 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	8183 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	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
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 /*
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 * 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	8188 * 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	8189 * Parameters:
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 * 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	8191 */
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 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	8193 {
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 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	8195 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	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 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	8198 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	8199 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	8200 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	8201 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	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
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 /*
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 * 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	8206 * 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	8207 * Parameters:
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 * 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	8209 */
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 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	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 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	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(!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	8215 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	8216
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8217 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	8218
775 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 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	8220 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8221 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	8222 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	8223 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8224
1156 03b6d9fdfac0 Fixed a typo on Unix... timeout not time. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	8225 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	8226 {
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	8227 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	8228 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	8229
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	8230 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	8231 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	8232 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	8233 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	8234 }
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	8235 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	8236 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	8237
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8238 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	8239 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	8240 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	8241 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	8242 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	8243 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	8244 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8245
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 * 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	8248 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8249 * 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	8250 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8251 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	8252 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8253 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	8254 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	8255
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 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	8257 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	8258 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	8259 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	8260 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	8261 *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	8262
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	8263 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	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 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	8267 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	8268 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	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
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 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	8272 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8273 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	8274 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	8275 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	8276 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	8277 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	8278 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	8279
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 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	8281 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	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 /* 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	8284 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	8285 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8286 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	8287 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	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 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	8291 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	8292
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 /* 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	8294 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	8295
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 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	8297 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8298 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	8299 FD_SET(listenfd, &rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8300 int 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	8301
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 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	8303
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8304 /* 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	8305 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	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 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	8308 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	8309
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8310 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	8311 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8312
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 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	8314 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8315 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	8316 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	8317 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8318
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 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	8320 {
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 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	8322 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	8323
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8324 if(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	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 /* 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	8327 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	8328 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	8329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8330 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	8331 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	8332
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8333 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	8334
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 /* 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	8336 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	8337 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	8338 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8339 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8340
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 /* 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	8342 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	8343 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8344 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	8345 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8346 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	8347 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8348 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	8349
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8350 /* 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	8351 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	8352 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	8353 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	8354 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	8355 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 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	8357 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	8358 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	8359 }
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 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	8361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8362 /* 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	8363 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	8364 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	8365 }
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 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	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 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	8369 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8370 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	8371 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8372 /* 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	8373 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	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 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	8376 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	8377 /* 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	8378 {
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 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	8380 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	8381
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 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	8383
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 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	8385 {
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 /* 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	8387 * 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	8388 * 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	8389 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8390 if(array[s].waiting)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8391 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	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 }
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 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	8395 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	8396 /* 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	8397 {
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 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	8399
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 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	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 /* 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	8403 if(posted)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8404 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	8405 }
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 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	8407 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	8408 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8409 /* 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	8410 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	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 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	8413 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8414 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8415 }
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 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8417 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8418 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8419
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8420 /* 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	8421 /* 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	8422 * 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	8423 * Parameters:
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 * 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	8425 * 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	8426 * 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	8427 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8428 HEV dw_named_event_new(char *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	8429 {
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 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	8431 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	8432 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	8433
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8434 if(!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	8435 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	8436
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8437 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	8438 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	8439 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	8440 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	8441 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	8442 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	8443 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	8444
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 /* 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	8446 * 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	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 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	8449
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8450 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	8451 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	8452 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	8453 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	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 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	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 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	8458 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	8459 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	8460 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	8461 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	8462 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	8463 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	8464 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	8465 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8466
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8467 /* 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	8468 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	8469 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	8470 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8471
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 /* 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	8473 * Parameters:
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 * 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	8475 * 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	8476 * 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	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 HEV dw_named_event_get(char *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	8479 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8480 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	8481 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	8482 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	8483 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	8484
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8485 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	8486 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	8487 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	8488 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	8489 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	8490 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	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
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 /* 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	8494 * 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	8495 * Parameters:
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 * 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	8497 * 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	8498 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8499 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	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 /* 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	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
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8504 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8505 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8506
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8507 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	8508 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8509 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	8510 }
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 /* 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	8513 * 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	8514 * Parameters:
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 * 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	8516 * 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	8517 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8518 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	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
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 /* 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	8522 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	8523
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8524 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8525 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8526
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8527 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	8528 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8529 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	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
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 /* 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	8533 * 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	8534 * Parameters:
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 * 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	8536 * 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	8537 * 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	8538 * 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	8539 */
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 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	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 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	8543 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	8544 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	8545 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	8546
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8547 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	8548 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	8549
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8550 /* 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	8551 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	8552 {
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 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	8554 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	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 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	8557 }
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 FD_ZERO(&rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8560 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	8561
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 /* 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	8563 tmp = (char)2;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8564 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	8565
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8566 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8567 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	8568
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8569 /* 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	8570 tmp = (char)3;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8571 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8572 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	8573
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 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	8575 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	8576 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	8577 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	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 /* 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	8580 * 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	8581 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8582 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	8583 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8584 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	8585 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8586
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 /* 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	8588 * 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	8589 * Parameters:
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 * 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	8591 * 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	8592 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8593 int 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	8594 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8595 /* 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	8596 * 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	8597 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8598 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8599 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	8600 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8601
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8602 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8603 * 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	8604 * 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	8605 * 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	8606 * 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	8607 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8608 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8609 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8610 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8611
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8612 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	8613 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	8614 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	8615 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8616
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	8617 /*
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8618 * 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	8619 * 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	8620 * 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	8621 * 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	8622 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8623 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8624 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8625 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	8626
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8627 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	8628 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8629 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	8630 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8631 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8632
775 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 * 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	8635 */
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 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	8637 {
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 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	8639 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	8640
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8641 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	8642
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8643 /* Initialize colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8644 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8645
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8646 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	8647 free(tmp);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8648
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8649 /* Free colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8650 _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	8651 }
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 * 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	8655 * Parameters:
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 * 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	8657 * 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	8658 * 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	8659 * 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	8660 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8661 HSHM dw_named_memory_new(void *dest, int size, char 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	8662 {
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	8663 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	8664 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	8665
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 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	8667 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	8668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8669 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	8670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8671 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	8672 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	8673 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8674
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8675 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8676 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8677 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8678 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8679 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8680 }
775 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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8682 /* 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	8683 *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	8684
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8685 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	8686 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8687 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	8688 *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	8689 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	8690 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	8691 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8692
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8693 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	8694 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	8695 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	8696
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 handle;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8700 /*
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 * 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	8702 * Parameters:
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 * 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	8704 * 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	8705 * 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	8706 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8707 HSHM dw_named_memory_get(void *dest, int size, char 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	8708 {
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	8709 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	8710 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	8711
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8712 mkdir("/tmp/.dw", S_IWGRP\|S_IWOTH);
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	8713 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	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 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	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 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	8718 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	8719 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8720
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8721 /* 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	8722 *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	8723
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724 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	8725 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8726 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	8727 *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	8728 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	8729 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	8730 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8731
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8732 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	8733 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	8734 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	8735
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8736 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	8737 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8738
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8739 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8740 * 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	8741 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742 * 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	8743 * 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	8744 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8745 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	8746 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8747 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	8748 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	8749
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8750 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	8751 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	8752 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8753 /* 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	8754 * 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	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 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	8757 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	8758 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	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 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	8761 }
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 * 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	8764 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8765 * 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	8766 * 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	8767 * 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	8768 */
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 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	8770 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8771 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	8772 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	8773 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	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 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	8776 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	8777
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 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	8779 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	8780 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	8781 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	8782 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8783
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8785 * 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	8786 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8787 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	8788 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8789 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	8790 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8791
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8792 /*
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 * 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	8794 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8795 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	8796 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8797 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	8798 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8799
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8800 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8801 * 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	8802 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8803 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	8804 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8805 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8806
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8807 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8808 * 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	8809 * Parameters:
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 * 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	8811 */
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 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	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 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	8815 }
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
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	8817 /* 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	8818 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	8819 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8820 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	8821
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	8822 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	8823
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	8824 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	8825 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8826 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	8827 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	8828 /* 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	8829 *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	8830 *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	8831 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8832 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	8833 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8834 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	8835 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	8836 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	8837 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	8838 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	8839 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	8840
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	8841 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	8842
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	8843 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	8844
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	8845 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	8846 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	8847 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	8848 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	8849
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	8850 /* 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	8851 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	8852 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8853 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	8854 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	8855 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	8856 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	8857 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	8858 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	8859
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	8860 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	8861 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8862 *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	8863 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	8864 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8865 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	8866 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8867 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	8868 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8869 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	8870 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8871 *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	8872 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	8873 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8874 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	8875 *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	8876 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8877 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8878 *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	8879 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	8880 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	8881 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	8882 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	8883 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8884 if(hscrolled)
1563 90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1562 diff changeset	8885 *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	8886 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8887 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	8888 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8889 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	8890 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	8891
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	8892 *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	8893 *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	8894 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8895 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8896 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	8897 *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	8898 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	8899 *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	8900 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	8901 *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	8902 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	8903 *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	8904 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8905
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	8906 /* 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	8907 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	8908 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8909 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	8910 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	8911
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8912 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	8913 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	8914
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8915 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8916 * 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	8917 * 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	8918 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8919 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	8920 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8921 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	8922 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	8923 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8924
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8925 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	8926
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8927 /* 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	8928 * 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	8929 */
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	8930 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	8931 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	8932
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8933 /* 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	8934 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	8935 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8936 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	8937 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	8938 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	8939 }
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8940 /* 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	8941 * 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	8942 */
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	8943 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	8944 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8945 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	8946
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	8947 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	8948 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8949 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	8950 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	8951
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	8952 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	8953 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	8954 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	8955 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	8956
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8957 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	8958 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	8959 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	8960 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8961 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8962
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8963 /* 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	8964 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	8965
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8966 /* 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	8967 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	8968 {
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	8969 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	8970 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	8971
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8972 /* 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	8973 * 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	8974 * 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	8975 * 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	8976 */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8977 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	8978 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8979 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	8980
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8981 /* 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	8982 * 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	8983 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8984 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	8985
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8986 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	8987 {
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	8988 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	8989 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	8990 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	8991 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	8992 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8993 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8994 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	8995 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8996 /* 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	8997 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	8998 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8999
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9000 /* 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	9001 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	9002 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	9003 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	9004 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	9005
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9006 #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	9007 /* 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	9008 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	9009 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9010 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	9011
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9012 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	9013 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9014 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	9015 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	9016 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9017 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9018 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	9019 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9020 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	9021
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9022 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	9023 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9024 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	9025 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	9026 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9027 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9028 #endif
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9029
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9030 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	9031 /* 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	9032 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	9033 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	9034 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	9035 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	9036 /* 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	9037 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	9038 /* 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	9039 * 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	9040 */
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	9041 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	9042 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9043 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	9044 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	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 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	9047 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9048 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	9049 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	9050 }
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	9051 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	9052 /* 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	9053 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	9054 {
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	9055 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	9056
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	9057 /* 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	9058 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	9059 _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	9060
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9061 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	9062 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	9063 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	9064 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	9065 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	9066 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	9067 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	9068 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	9069 }
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 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	9071 {
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9072 /* 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	9073 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	9074 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	9075 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	9076 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	9077 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	9078 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	9079 }
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	9080 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	9081 {
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 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	9083 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	9084
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9085 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	9086 {
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 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	9088 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	9089 }
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 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	9091 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	9092 }
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	9093 /* 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	9094 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	9095 {
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	9096 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	9097 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	9098 }
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	9099 }
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 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	9101
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 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	9103 {
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 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	9105 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	9106 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	9107 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	9108 }
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 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9110
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 /*
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	9112 * 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	9113 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9114 * 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	9115 * 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	9116 * 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	9117 */
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	9118 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	9119 {
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	9120 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	9121
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	9122 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	9123 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	9124 {
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	9125 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	9126 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	9127
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	9128 /* 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	9129 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	9130 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	9131
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9132 /* 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	9133 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	9134 {
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	9135 /* 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	9136 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	9137 #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	9138 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	9139 #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	9140
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	9141 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	9142 {
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	9143 /* 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	9144 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	9145 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	9146 }
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	9147 /* 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	9148 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	9149 {
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	9150 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	9151 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	9152 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9153 /* 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	9154 #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	9155 /* 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	9156 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	9157 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9158 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	9159
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9160 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	9161 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9162 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	9163 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9164 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	9165 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9166 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9167 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9168 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9169 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9170 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9171 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	9172
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9173 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	9174 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9175 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	9176 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9177 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	9178 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9179 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9180 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9181 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9182 #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	9183 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	9184 #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	9185 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	9186 }
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	9187 }
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	9188 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	9189 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	9190 }
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	9191
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	9192 /*
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	9193 * 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	9194 * 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	9195 * 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	9196 * 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	9197 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9198 * 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	9199 */
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	9200 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	9201 {
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9202 int _locked_by_me = FALSE;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9203 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	9204
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9205 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	9206 /* 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	9207 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9208 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9209 /* 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	9210 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	9211 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	9212 #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	9213 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	9214 #else
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9215 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9216
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9217 /* 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	9218 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9219 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9220 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9221
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9222 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	9223 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9224 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	9225 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9226 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9227 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	9228 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9229 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9230 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9231 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9232
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9233 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	9234 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9235 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	9236 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9237 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9238 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	9239 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9240 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9241
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9242 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9243 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9244 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9245 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9246 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	9247 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9248 /* 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	9249 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	9250 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	9251 else if(item)
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9252 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9253 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	9254 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9255 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	9256 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	9257 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9258 /* 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	9259 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	9260 #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	9261 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	9262 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	9263 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9264 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	9265 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9266 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9267 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9268 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9269 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9270 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	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
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 /*
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9274 * 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	9275 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9276 * 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	9277 * 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	9278 * 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	9279 * 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	9280 * 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	9281 * 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	9282 * 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	9283 * 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	9284 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9285 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	9286 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9287 _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	9288 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9289
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9290 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9291 * 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	9292 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9293 * 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	9294 * 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	9295 * 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	9296 * 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	9297 * 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	9298 * 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	9299 * 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	9300 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9301 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	9302 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9303 /* 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	9304 * 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	9305 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9306 _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	9307 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9308
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9309 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9310 * 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	9311 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9312 * 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	9313 * 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	9314 * 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	9315 * 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	9316 * 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	9317 * 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	9318 * 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	9319 */
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9320 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	9321 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9322 _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	9323 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9324
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9325
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9326 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	9327 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	9328 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	9329
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9330 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	9331 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9332 /* 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	9333 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	9334 extents_time = 0;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9335 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	9336 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9337
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9338 /* 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	9339 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	9340 {
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	9341 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	9342 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9343 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	9344 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	9345 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	9346 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	9347 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	9348 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	9349
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9350 if(!extents_atom)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9351 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	9352
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	9353 /* 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	9354 *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	9355 *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	9356
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9357 /* 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	9358 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	9359 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9360 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	9361 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	9362 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	9363 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	9364 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	9365 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9366 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9367 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	9368
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9369 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	9370 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	9371 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	9372 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	9373 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	9374
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9375 /* 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	9376 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	9377 (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	9378 &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	9379
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9380 /* 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	9381 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	9382
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	9383 /* 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	9384 time(&extents_time);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9385
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	9386 /* 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	9387 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9388 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9389 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9390 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9391 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9392 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	9393
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9394 /* 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	9395 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	9396 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9397
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	9398 /* 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	9399 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	9400 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	9401 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	9402 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	9403 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	9404 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	9405 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9406 *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	9407 *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	9408 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9409 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9410 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	9411 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	9412 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9413
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9414 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9415 * 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	9416 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9417 * 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	9418 * 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	9419 * 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	9420 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9421 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	9422 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9423 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	9424
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9425 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	9426 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	9427
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9428 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9429 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	9430 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9431 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	9432 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	9433
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9434 /* 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	9435 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	9436 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9437 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9438 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	9439
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9440 /* 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	9441 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	9442 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	9443
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9444 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	9445 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	9446 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9447 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	9448 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	9449 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9450 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9451 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9452 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9453 /* 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	9454 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	9455 (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	9456 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9457 /* 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	9458 * 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	9459 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9460 _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	9461 /* 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	9462 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	9463 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	9464 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9465 /* 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	9466 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	9467 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	9468 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9469 /* 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	9470 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	9471 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9472 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	9473 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	9474 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9475 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9476 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	9477 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	9478 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9479 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9480
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9481 /*
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	9482 * 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	9483 * 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	9484 * 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	9485 * 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	9486 * 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	9487 */
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	9488 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	9489 {
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	9490 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	9491
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	9492 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	9493 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	9494 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9495 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	9496
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	9497 _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	9498
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	9499 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	9500 *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	9501 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	9502 *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	9503 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9504 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	9505 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9506 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	9507 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	9508 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	9509 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	9510 }
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	9511 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	9512 }
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	9513
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9514 /* 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	9515 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9516 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9517 #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	9518 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9519 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	9520
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9521 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9522 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9523 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	9524
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9525 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9526 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9527 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9528 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9529 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9530 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9531 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9532 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9533 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	9534 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9535 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	9536 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9537 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9538
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	9539 /*
775 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 * 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	9541 */
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 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	9543 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9544 int retval = 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9545 int _locked_by_me = FALSE;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9546
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9547 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9548 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	9549 DW_MUTEX_UNLOCK;
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 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	9551 }
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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9553 /* 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	9554 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9555 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9556 #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	9557 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9558 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	9559
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9560 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9561 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9562 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	9563
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9564 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9565 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9566 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9567 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9568 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9569 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9570 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9571 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9572 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	9573 #else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9574 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	9575 #endif
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9576 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9577
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9578 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9579 * 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	9580 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9581 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	9582 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9583 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	9584 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	9585
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9586 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9587 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	9588 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9589 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	9590 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9591
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9592 /* 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	9593 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	9594 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9595 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	9596 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	9597 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	9598
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9599 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9600 #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	9601 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	9602 #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	9603 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	9604 #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	9605 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	9606 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9607 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	9608 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9610 /*
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9611 * 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	9612 * 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	9613 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9614 * 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	9615 * 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	9616 * 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	9617 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9618 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	9619 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9620 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	9621 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	9622 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9623
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9624 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9625 * 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	9626 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9627 * 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	9628 * 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	9629 * 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	9630 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9631 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	9632 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9633 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	9634 #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	9635 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9636 #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	9637
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9638 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9639 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	9640
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9641 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	9642 #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	9643 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	9644 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9645 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	9646 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9647 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9648 #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	9649 {
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9650 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	9651
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9652 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	9653 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9654 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	9655 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	9656 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	9657 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	9658 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	9659 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	9660
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9661 /* 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	9662 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	9663 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9664 /* 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	9665 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	9666 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9667 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	9668 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	9669
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9670 /* 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	9671 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	9672
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	9673 /* 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	9674 * 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	9675 * 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	9676 */
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9677 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	9678 (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	9679 {
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	9680 _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	9681 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	9682 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	9683 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9684 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	9685 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	9686 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9687 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9688 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9689 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9690 /* 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	9691 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	9692 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9693 /* 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	9694 * 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	9695 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9696 _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	9697 /* 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	9698 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	9699 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	9700 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9701 /* 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	9702 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	9703 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	9704 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	9705 /* 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	9706 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	9707 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	9708 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	9709 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9710 /* 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	9711 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	9712 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9713 /* 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	9714 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9715 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9716 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9717 /* 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	9718 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	9719 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9720 /* 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	9721 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	9722 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	9723 /* 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	9724 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	9725 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	9726 /* 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	9727 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	9728 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	9729 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	9730 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	9731
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9732 #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	9733 /* 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	9734 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	9735 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9736 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9737 #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	9738 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	9739
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9740 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9741 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9742 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	9743
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9744 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9745 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9746 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9747 #else
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9748 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	9749
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9750 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	9751 #endif
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9752 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	9753 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9754 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	9755 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9756 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	9757 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	9758 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9759 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	9760 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9761 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	9762 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9763 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	9764 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	9765 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9766 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9767 #endif
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	9768 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9769 /* 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	9770 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	9771 }
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9772 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	9773 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	9774 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9775 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9776 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9777
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9778 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9779 * 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	9780 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9781 * 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	9782 * 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	9783 * 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	9784 * 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	9785 * 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	9786 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9787 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	9788 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9789 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	9790 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	9791 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9793 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9794 * 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	9795 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9796 * 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	9797 * 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	9798 * 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	9799 * 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	9800 * 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	9801 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9802 void dw_window_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	9803 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9804 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	9805 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	9806 #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	9807 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9808 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9809
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9810 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9811 #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	9812 /* 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	9813 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	9814 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9815 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	9816 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9817 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9818 #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	9819 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9820 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	9821
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9822 /* 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	9823 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	9824 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9825 /* 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	9826 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	9827 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9828 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	9829 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9830 GdkRectangle frame;
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 /* 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	9833 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	9834 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	9835 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	9836 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	9837 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	9838 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9839 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9840 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	9841 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9842 /* 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	9843 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	9844 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	9845 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9846 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9847 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9848 /* 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	9849 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9850 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9851 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9852 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9853 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9854 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9855 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9856 *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	9857 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9858 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9859
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9860 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9861 * 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	9862 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9863 * 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	9864 * 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	9865 * 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	9866 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9867 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	9868 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9869 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	9870 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	9871
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9872 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9873 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	9874 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9875 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	9876 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	9877 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	9878 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9879 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	9880 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9881 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	9882 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	9883 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	9884 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9885 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	9886 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9887 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	9888 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9889 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	9890 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9891 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	9892 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9893 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	9894 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9895 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	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 }
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 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	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 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	9902 /* 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	9903 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	9904 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	9905 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	9906 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	9907 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	9908 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	9909 /* 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	9910 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	9911 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	9912 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	9913 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	9914 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	9915 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	9916 #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	9917 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	9918 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	9919 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	9920 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	9921 #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	9922 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	9923 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	9924 }
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	9925 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	9926 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9927 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	9928
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	9929 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	9930 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	9931
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9932 _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	9933 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	9934 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	9935 _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	9936 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9937 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	9938 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9939 _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	9940 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	9941 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	9942 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	9943 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	9944 _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	9945 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9946 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9947 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9950 * 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	9951 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9952 * 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	9953 * 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	9954 * 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	9955 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9956 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	9957 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9958 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	9959 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	9960 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	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 DW_MUTEX_LOCK;
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 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	9964
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9965 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	9966 {
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 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	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 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	9970 {
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	9971 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	9972 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	9973
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9974 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	9975 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	9976
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	9977 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	9978 /* 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	9979 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	9980 DW_MUTEX_UNLOCK;
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 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	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 }
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 }
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 DW_MUTEX_UNLOCK;
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
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 /* 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	9988 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	9989 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9990
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9991 /* 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	9992 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	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 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	9995 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	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 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	9998 {
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 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	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 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	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 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	10004 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	10005 }
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 }
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 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	10009 }
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 /*
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 * 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	10013 * Parameters:
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 * 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	10015 * 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	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 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	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 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	10020 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	10021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10022 DW_MUTEX_LOCK;
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 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	10024 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	10025 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10026 gtk_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	10027 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	10028 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	10029 }
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 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	10035 * Parameters:
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 * 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	10037 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10038 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	10039 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10040 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	10041 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	10042
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10043 DW_MUTEX_LOCK;
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 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	10045 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	10046 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10047 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	10048 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10049
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10050 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10051 * 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	10052 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10053 * 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	10054 * 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	10055 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10056 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	10057 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10058 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	10059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10060 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10061 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	10062 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	10063 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	10064 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10066
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10067
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 /*
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 * 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	10070 * Parameters:
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 * 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	10072 * 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	10073 * 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	10074 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10075 void dw_notebook_page_set_text(HWND handle, unsigned long pageid, char *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	10076 {
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 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	10078 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	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 DW_MUTEX_LOCK;
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 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	10082 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	10083 {
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	10084 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	10085 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	10086
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	10087 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	10088 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	10089 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	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
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 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	10093 {
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 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	10095 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	10096 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	10097 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10099 }
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
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 /*
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 * 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	10103 * Parameters:
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 * 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	10105 * 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	10106 * 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	10107 */
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 void dw_notebook_page_set_status_text(HWND handle, unsigned long pageid, char *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	10109 {
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 /* 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	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 /*
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 * 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	10115 * Parameters:
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 * 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	10117 * 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	10118 * 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	10119 */
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 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	10121 {
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 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	10123 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	10124 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	10125 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	10126
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	10127 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	10128 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	10129 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	10130 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	10131 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	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 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	10134 {
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 DW_MUTEX_UNLOCK;
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 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	10137 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10138
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 /* 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	10140 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	10141 {
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 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	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 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	10145 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	10146 {
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 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	10148 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	10149 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	10150 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	10151 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	10152 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	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
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 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	10158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10159 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	10160
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10161 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	10162 {
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	10163 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	10164 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	10165 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10166
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 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	10168 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	10169 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	10170 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	10171 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	10172 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	10173 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10174 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10175
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 /*
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 * 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	10178 * Parameters:
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 * 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	10180 * 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	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 void dw_listbox_append(HWND handle, char *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	10183 {
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	10184 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	10185 }
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
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 * 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	10189 * 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	10190 * Parameters:
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 * 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	10192 * 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	10193 * 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	10194 */
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 void dw_listbox_insert(HWND handle, char *text, int pos)
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 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10197 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	10198 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	10199 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	10200
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10201 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	10202 /* 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	10203 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	10204 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10205 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	10206 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	10207 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	10208 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10209 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	10210 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10211 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10212
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	10213 /* 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	10214 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	10215 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	10216 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	10217 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	10218
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	10219 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	10220 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10221 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	10222 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	10223 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10224
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	10225 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	10226 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10227 /* 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	10228 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	10229 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10230 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	10231 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10232 /* 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	10233 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	10234 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10235 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	10236 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10237 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	10238 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10239
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10240 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10241 * 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	10242 * 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	10243 * 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	10244 * 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	10245 * 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	10246 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10247 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	10248 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10249 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	10250 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	10251 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	10252
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10253 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	10254 /* 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	10255 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	10256 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10257 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	10258 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	10259 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	10260 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10261 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	10262 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10263 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	10264 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10265
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	10266 /* 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	10267 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	10268 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	10269 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	10270 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	10271
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	10272 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	10273 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10274 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	10275 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	10276 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10277
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	10278 /* 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	10279 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	10280 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10281 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	10282 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	10283 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10284 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10285 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	10286 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10287
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10288 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10289 * 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	10290 * 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	10291 * 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	10292 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10293 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	10294 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10295 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	10296 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	10297 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	10298
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10299 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	10300 /* 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	10301 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	10302 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10303 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	10304 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	10305 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	10306 }
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	10307 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	10308 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10309 /* 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	10310 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	10311 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	10312 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	10313 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	10314
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	10315 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	10316 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10317 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	10318 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	10319 }
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 /* Clear the list */
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10321 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	10322 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10323 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10324 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10326 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10327 * 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	10328 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10329 * 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	10330 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10331 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	10332 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10333 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	10334 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	10335 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	10336 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	10337
99ce0ea1f271 Implemented many 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 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	10339 /* 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	10340 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	10341 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10342 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	10343 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	10344 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	10345 }
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	10346 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	10347 {
99ce0ea1f271 Implemented many 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 /* 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	10349 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	10350 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	10351 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	10352 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	10353
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	10354 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	10355 {
99ce0ea1f271 Implemented many 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 /* 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	10357 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	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 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10360 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10361 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	10362 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10363
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10364 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10365 * 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	10366 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 * 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	10368 * 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	10369 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10370 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	10371 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10372 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	10373 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	10374
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10375 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10376 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	10377 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10378 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	10379 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	10380 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	10381 }
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10382 /* 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	10383 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	10384 {
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10385 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	10386 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	10387
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10388 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10389 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10390 /* 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	10391 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	10392 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	10393 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	10394 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	10395 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	10396
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10397 /* Safety check */
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10398 if(rowcount < 2)
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10399 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10400 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10401 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10402 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	10403
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10404 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10405 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10406 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10407 top = rowcount;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10408
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10409 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	10410
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10411 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	10412 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10413 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10414 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10416
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10417 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10418 * 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	10419 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10420 * 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	10421 * 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	10422 * 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	10423 * 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	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 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	10426 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10427 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	10428 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	10429 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	10430
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10431 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	10432 /* 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	10433 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	10434 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10435 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	10436 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	10437 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	10438 }
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	10439 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	10440 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10441 /* 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	10442 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	10443 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	10444 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	10445 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	10446
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10447 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	10448 {
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	10449 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10450
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10451 /* 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	10452 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	10453 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10454 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10455 gchar *text;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10456 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	10457 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10458 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10459 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	10460 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10461 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10462 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10463 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10464 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10465 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10466 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10467 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	10468 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10469 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10470
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10471 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10472 * 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	10473 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10474 * 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	10475 * 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	10476 * 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	10477 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10478 void dw_listbox_set_text(HWND handle, unsigned int index, char *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	10479 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10480 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	10481 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	10482 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	10483
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10484 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	10485 /* 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	10486 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	10487 {
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 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	10489 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	10490 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	10491 }
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	10492 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	10493 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10494 /* 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	10495 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	10496 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	10497 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	10498 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	10499
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10500 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	10501 {
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	10502 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10503
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10504 /* 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	10505 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	10506 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10507 /* Update the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10508 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	10509 }
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	10510 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10511 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10512 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10515 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10516 * 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	10517 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10518 * 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	10519 * 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	10520 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10521 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	10522 {
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	10523 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	10524 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	10525 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	10526 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	10527
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10528 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	10529 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	10530
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	10531 /* 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	10532 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	10533 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	10534
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	10535 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	10536 {
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	10537 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	10538 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	10539
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	10540 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	10541 {
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	10542 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	10543 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	10544
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	10545 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	10546 {
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	10547 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	10548
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	10549 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	10550 {
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	10551 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	10552 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	10553 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10554
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	10555 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	10556 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	10557 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10558
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	10559 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	10560 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	10561 }
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	10562 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10563 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	10564 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	10565 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10566
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10567 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10568 * 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	10569 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10570 * 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	10571 */
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	10572 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	10573 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10574 GtkWidget *handle2 = handle;
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10575 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10576 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	10577 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	10578
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10579 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10580 /* 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	10581 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	10582 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10583 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	10584 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	10585 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	10586 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10587 if(handle2)
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 /* 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	10590 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	10591 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	10592 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	10593 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	10594
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10595 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10596 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10597 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	10598 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10599 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	10600 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	10601 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	10602 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10603 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	10604 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	10605
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10606 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	10607 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10608 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	10609 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10610
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10611 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	10612 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	10613 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10614 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10615 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10616 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10617 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	10618 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10619
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	10620 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	10621 {
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	10622 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	10623 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	10624 {
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	10625 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	10626
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	10627 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	10628 {
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	10629 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	10630 }
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	10631 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	10632 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 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 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10635 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10636 }
775 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 DW_MUTEX_UNLOCK;
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 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	10639 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10640
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10641 /*
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 * 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	10643 * Parameters:
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 * 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	10645 * 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	10646 * 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	10647 */
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 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	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 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	10651 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10652 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	10653
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10654 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10655 /* 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	10656 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	10657 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10658 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	10659 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	10660 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	10661 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10662 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10663 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10664 /* 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	10665 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	10666 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	10667 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	10668 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	10669
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10670 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	10671 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10672 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10673
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10674 /* 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	10675 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	10676 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10677 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	10678 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10679 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	10680 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10681 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10682 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10683 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	10684 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10685 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10686 /* 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	10687 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	10688 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10689 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10690 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10691 /* 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	10692 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	10693 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10694 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10695 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10696 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10697 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10698 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10699 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10700
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10701 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10702 * 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	10703 * Parameters:
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 * 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	10705 * 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	10706 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10707 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	10708 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10709 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	10710 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	10711 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	10712
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10713 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	10714 /* 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	10715 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	10716 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10717 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	10718 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	10719 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	10720 }
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	10721 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	10722 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10723 /* 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	10724 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	10725 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	10726 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	10727 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	10728
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	10729 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	10730 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10731 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10732
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10733 /* 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	10734 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	10735 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10736 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	10737 }
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	10738 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10739 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10740 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742
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	10743 /* 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	10744 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	10745 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10746 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	10747 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	10748
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10749 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	10750 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10751 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	10752
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	10753 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	10754
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10755 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	10756 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	10757 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	10758 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	10759 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	10760 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	10761 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10762 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	10763 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10764
775 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 /* 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	10766 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	10767 {
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 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	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 /* 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	10771 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	10772 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	10773
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	10774 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	10775 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	10776 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10777
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 /*
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 * 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	10780 * Parameters:
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 * 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	10782 * 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	10783 * 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	10784 * 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	10785 * 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	10786 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10787 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	10788 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10789 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	10790 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	10791 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	10792
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10793 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	10794 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	10795 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	10796 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	10797 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	10798 *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	10799 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	10800 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	10801 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	10802 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10803 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	10804 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10805
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10806 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10807 * 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	10808 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10809 * 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	10810 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10811 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	10812 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10813 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	10814 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	10815
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10816 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	10817 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	10818 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	10819 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	10820
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 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	10822 *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	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 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	10825 {
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 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	10827
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 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	10829 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10832 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10833 * 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	10834 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10835 * 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	10836 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10837 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	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 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	10840
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 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	10842 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	10843 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	10844 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10845
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10846 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10847 * 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	10848 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10849 * 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	10850 * 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	10851 * 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	10852 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10853 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	10854 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10855 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	10856 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	10857 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	10858 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	10859 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	10860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10861 DW_MUTEX_LOCK;
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 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	10863 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	10864 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	10865 /* 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	10866 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	10867 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	10868 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	10869 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	10870 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	10871 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	10872
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10873 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10874 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	10875 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10876
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10877 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10878 * 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	10879 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10880 * 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	10881 * 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	10882 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10883 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	10884 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10885 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	10886
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 DW_MUTEX_LOCK;
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 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	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 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	10891 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	10892 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10893 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10894 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	10895 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10896
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10897 /*
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 * 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	10899 * Parameters:
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 * 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	10901 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10902 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	10903 {
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 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	10905
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 DW_MUTEX_LOCK;
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 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	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 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	10910 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	10911 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10912 DW_MUTEX_UNLOCK;
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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10916 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10917 * 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	10918 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10919 * 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	10920 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10921 * 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	10922 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10923 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	10924 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10925 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	10926
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10927 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10928 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10929
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10930 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	10931 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	10932 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	10933 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10934
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10935 /*
775 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 * 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	10937 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10938 * 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	10939 * 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	10940 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10941 * 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	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 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	10944 {
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 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	10946
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10947 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	10948 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	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 DW_MUTEX_LOCK;
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 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	10952 DW_MUTEX_UNLOCK;
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 /*
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 * 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	10957 * Parameters:
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 * 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	10959 * 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	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 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	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 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	10964
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10965 if(!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	10966 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	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 DW_MUTEX_LOCK;
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 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	10970 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10971 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10972
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10973 /*
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 * 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	10975 * Parameters:
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 * 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	10977 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10978 void dw_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	10979 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10980 struct utsname 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	10981 char tempbuf[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	10982 int 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	10983
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 uname(&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	10985 strcpy(env->osName, name.sysname);
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 strcpy(tempbuf, name.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	10987
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10988 env->MajorBuild = env->MinorBuild = 0;
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
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 len = strlen(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	10991
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 strcpy(env->buildDate, __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	10993 strcpy(env->buildTime, __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	10994 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	10995 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	10996 #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	10997 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	10998 #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	10999 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	11000 #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	11001
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 for(z=1;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	11003 {
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 if(tempbuf[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	11005 {
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 tempbuf[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	11007 env->MajorVersion = atoi(&tempbuf[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	11008 env->MinorVersion = atoi(&tempbuf[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	11009 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	11010 }
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 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	11013 env->MinorVersion = 0;
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
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 /*
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 * 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	11018 * Parameters:
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 * 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	11020 * 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	11021 * 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	11022 * 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	11023 * 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	11024 * 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	11025 * 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	11026 *
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 char dw_file_browse(char title, char defpath, char ext, int 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	11029 {
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 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	11031
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 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	11033 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	11034 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	11035 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	11036 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	11037 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	11038 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	11039
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11040 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	11041 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11042 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	11043 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	11044 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	11045 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	11046 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	11047 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	11048 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	11049 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	11050 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	11051 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	11052 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	11053 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	11054 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	11055 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	11056 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	11057 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	11058 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11059
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11060 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	11061 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11062 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	11063 _("_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	11064 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	11065 NULL);
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 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	11068 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	11069
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 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	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 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	11073 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	11074 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	11075 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	11076 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	11077 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	11078 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	11079 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	11080 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	11081 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	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
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 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	11085 {
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11086 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	11087
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	11088 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	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 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	11091 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11092
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11093 /* See if the path exists */
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11094 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11095 {
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11096 /* 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	11097 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11098 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	11099 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	11100 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	11101 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11102 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	11103 }
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11104 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11105 {
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	11106 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	11107 {
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	11108 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	11109
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	11110 /* 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	11111 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	11112 {
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	11113 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	11114 }
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	11115 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	11116 {
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	11117 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	11118 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	11119
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	11120 /* 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	11121 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	11122 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	11123
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	11124 /* 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	11125 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	11126 {
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	11127 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	11128 {
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	11129 /* 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	11130 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	11131 }
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	11132 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11133
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	11134 /* 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	11135 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	11136 /* ... 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	11137 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	11138 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	11139 }
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	11140 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11141 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11142 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11143
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11144 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	11145 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11146 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	11147 /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	11148 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11149
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11150 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	11151 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	11152 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11153
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11154
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11155 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11156 * 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	11157 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11158 * 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	11159 * 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	11160 * 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	11161 * 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	11162 * -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	11163 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11164 int dw_exec(char program, int type, char *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	11165 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11166 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	11167
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11168 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	11169 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11170 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	11171
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11172 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	11173 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	11174 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	11175 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	11176 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11177 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	11178 }
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 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	11180 {
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 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	11182
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11183 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	11184 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 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	11186 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	11187 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11188 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	11189 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11190 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	11191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11192 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	11193 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11194 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	11195 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11196 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	11197 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	11198 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	11199 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	11200 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	11201 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11202 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	11203 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	11204 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11205 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	11206 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11207 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	11208 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	11209 }
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 /* 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	11211 _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	11212 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11213 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	11214 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11215
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11216 /*
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 * 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	11218 * Parameters:
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 * 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	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 int dw_browse(char *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	11222 {
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11223 /* If possible load the URL/URI using gvfs... */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11224 if(gtk_show_uri(gdk_screen_get_default(), url, GDK_CURRENT_TIME, NULL))
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11225 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11226 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	11227 }
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11228 else
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11229 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11230 /* 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	11231 * 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	11232 */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11233 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	11234
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11235 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	11236 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	11237 execargs[0] = browser;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11238 execargs[1] = url;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11239 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11240
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11241 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	11242 }
775 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 }
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
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11245 #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	11246 /* 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	11247 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	11248 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11249 if(widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11250 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11251 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	11252 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	11253 return web_view;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11254 #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	11255 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	11256 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	11257 return web_view;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11258 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11259 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11260 return NULL;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11261 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11262 #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	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 * 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	11265 * Parameters:
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 * 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	11267 * 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	11268 */
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 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	11270 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11271 #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	11272 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	11273 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	11274
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11275 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	11276
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11277 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	11278 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11279 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	11280 {
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 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	11282 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	11283 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	11284 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	11285 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	11286 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	11287 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	11288 #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	11289 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	11290 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11291 webkit_web_view_open(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	11292 #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	11293 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	11294 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	11295 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	11296 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	11297 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	11298 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	11299 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	11300 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	11301 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11302 #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	11303 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	11304 webkit_print_operation_run_dialog(operation, NULL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11305 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11306 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	11307 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	11308 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11309 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11310 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	11311 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11312 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11313 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11314 #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	11315 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11316
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11317 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11318 * 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	11319 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11320 * 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	11321 * 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	11322 * 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	11323 * 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	11324 * 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	11325 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11326 int dw_html_raw(HWND handle, char *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	11327 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11328 #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	11329 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	11330 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	11331
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11332 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	11333 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	11334 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11335 #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	11336 webkit_web_view_load_html(web_view, string, "file:///");
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11337 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11338 webkit_web_view_load_html_string(web_view, string, "file:///");
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11339 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11340 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	11341 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11342 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	11343 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	11344 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11345 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	11346 #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	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 /*
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 * 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	11351 * Parameters:
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 * 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	11353 * 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	11354 * 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	11355 * 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	11356 * 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	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 int dw_html_url(HWND handle, char *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	11359 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11360 #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	11361 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	11362 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	11363
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11364 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	11365 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	11366 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11367 #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	11368 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	11369 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11370 webkit_web_view_open(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	11371 #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	11372 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	11373 }
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 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	11375 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	11376 #else
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11377 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	11378 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11379 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11380
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11381 #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	11382 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	11383 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11384 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	11385 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	11386
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11387 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	11388 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	11389 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11390
775 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 /*
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 * 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	11393 * 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	11394 * 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	11395 */
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11396 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	11397 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11398 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	11399
775 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 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	11401 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	11402 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	11403 }
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 #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	11405
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 /*
2005 a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11407 * 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	11408 * 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	11409 * 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	11410 */
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 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	11412 {
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	11413 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	11414 #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	11415 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	11416 WebKitWebView *web_view;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11417
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11418 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	11419 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	11420 /* 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	11421 * 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	11422 */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11423 #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	11424 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	11425 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	11426 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	11427 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	11428 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	11429 g_signal_connect(web_view, "populate-popup", G_CALLBACK(_dw_html_populate_popup_cb), NULL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11430 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1937 diff changeset	11431 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	11432 #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	11433 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	11434 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	11435 #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	11436 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	11437 #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	11438 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	11439 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11440
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11441 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11442 * 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	11443 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11444 * 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	11445 * 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	11446 * 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	11447 * 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	11448 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11449 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	11450 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11451 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11452 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11453 char *ret = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11454
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11455 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11456 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	11457 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11458 gchar *clipboard_contents;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11459
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11460 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	11461 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11462 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11463 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11464 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11465 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11466 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11467 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	11468 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11469
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11470 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11471 * 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	11472 * Parameters:
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 * 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	11474 */
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 void dw_clipboard_set_text( char *str, 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	11476 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11477 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11478 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11479
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11480 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11481 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	11482 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11483 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	11484 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11485 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11486 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11487
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11488 /* 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	11489 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	11490 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11491 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	11492 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	11493 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	11494 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11495 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11496
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11497 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	11498 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11499 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	11500 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11501 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	11502 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	11503 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	11504 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11505 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	11506 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11507 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11508 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11509
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11510 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11511 * 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	11512 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11513 * 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	11514 * 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	11515 * 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	11516 * 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	11517 * 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	11518 * Returns:
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1136 diff changeset	11519 * 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	11520 */
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11521 HPRINT API dw_print_new(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	11522 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11523 GtkPrintOperation *op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11524 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	11525
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11526 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11527 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11528
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11529 DW_MUTEX_LOCK;
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11530 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	11531 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11532 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	11533 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	11534 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	11535 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	11536 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	11537 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11538 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11539 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11540 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11541
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11542 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11543 * 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	11544 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11545 * 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	11546 * 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	11547 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11548 * 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	11549 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11550 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	11551 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11552 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11553 GtkPrintOperation op = (GtkPrintOperation )print;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11554 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	11555
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11556 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11557 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	11558 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11559 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	11560 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11561
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11562 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11563 * 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	11564 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11565 * 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	11566 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11567 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	11568 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11569 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	11570 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	11571
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11572 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11573 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	11574 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11575 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11576
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11577 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11578 * 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	11579 * 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	11580 * 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	11581 */
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 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	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 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	11585
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11586 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	11587 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11588 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	11589
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11590 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	11591 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	11592 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	11593 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	11594 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11595 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	11596 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11598 /*
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11599 * 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	11600 * 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	11601 */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11602 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	11603 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11604 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11605 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11606
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11607 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11608 * 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	11609 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11610 * 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	11611 * 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	11612 * 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	11613 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11614 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	11615 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11616 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	11617
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11618 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	11619
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11620 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	11621 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	11622 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11624 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11625 * 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	11626 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11627 * 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	11628 * 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	11629 * 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	11630 */
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 void dw_window_set_data(HWND window, char dataname, 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	11632 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11633 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	11634 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	11635
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11636 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	11637 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	11638
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11639 DW_MUTEX_LOCK;
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 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	11641 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11642 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	11643 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11644 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11645 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	11646 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11647 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11648
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 /*
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 * 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	11651 * Parameters:
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 * 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	11653 * 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	11654 * 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	11655 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11656 void dw_window_get_data(HWND window, char dataname)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11657 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11658 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	11659 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	11660 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	11661
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11662 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	11663 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	11664
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11665 DW_MUTEX_LOCK;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11666 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11667 {
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11668 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	11669 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11670 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11671 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	11672 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11673 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	11674 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11675
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	11676 /* 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	11677 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	11678 {
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	11679 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	11680 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	11681 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	11682 int *tag = data;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11683
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	11684 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	11685 {
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	11686 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	11687 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	11688 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	11689 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	11690 }
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	11691 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	11692 {
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	11693 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	11694 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	11695 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	11696 }
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	11697 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	11698 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	11699 }
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	11700
775 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 * 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	11703 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11704 * 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	11705 * 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	11706 * 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	11707 * 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	11708 * 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	11709 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11710 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	11711 {
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	11712 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	11713 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	11714
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	11715 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	11716
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	11717 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	11718 *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	11719 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	11720 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	11721 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	11722 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	11723 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	11724 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	11725 }
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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11728 * 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	11729 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11730 * 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	11731 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11732 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	11733 {
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	11734 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	11735 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	11736
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	11737 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	11738 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	11739 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	11740 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	11741 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	11742 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	11743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11744
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11745 /* 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	11746 * 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	11747 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11748 static HWND _find_signal_window(HWND window, char *signame)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11749 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11750 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	11751
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11752 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	11753 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	11754 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	11755 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	11756 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	11757 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	11758 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	11759 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11760
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11761 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11762 * 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	11763 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11764 * 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	11765 * 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	11766 * 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	11767 * 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	11768 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11769 void dw_signal_connect(HWND window, char signame, 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	11770 {
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	11771 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	11772 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11773
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11774 /* 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	11775 * 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	11776 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11777 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	11778 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11779 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11780 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11781 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11782 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	11783
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11784 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11785 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11786 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	11787
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11788 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11789 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11790 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	11791 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11792 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11793 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11794 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11795 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11796
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11797 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11798 * 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	11799 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11800 * 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	11801 * 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	11802 * 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	11803 * 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	11804 * 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	11805 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11806 void dw_signal_connect_data(HWND window, char signame, void sigfunc, void discfunc, void data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11807 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11808 void *thisfunc = _findsigfunc(signame);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11809 char *thisname = signame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11810 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	11811 int sigid, _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	11812 void *params = calloc(3, 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	11813 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	11814
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11815 /* 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	11816 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	11817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11818 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11819 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11820 * 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	11821 * 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	11822 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11823 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	11824 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11825 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	11826 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11827
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11828 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	11829 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11830 thisname = "draw";
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11831 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11832 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	11833 {
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 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	11835 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	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 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	11838 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11839 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	11840 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	11841 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11842 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	11843 _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	11844
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11845 DW_MUTEX_UNLOCK;
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 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	11847 }
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	11848 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	11849 (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	11850 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11851 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11852
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11853 thisname = "changed";
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11854
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11855 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	11856 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	11857 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	11858 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	11859 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11860 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	11861 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	11862 }
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	11863 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	11864 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11865 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	11866 }
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	11867 _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	11868
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11869 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11870 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	11871 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11872 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	11873 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11874 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	11875 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	11876 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	11877 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11878 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	11879 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	11880 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11881 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	11882 _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	11883
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11884 params = calloc(sizeof(void *), 3);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11885
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11886 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	11887 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	11888 }
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11889 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	11890 {
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11891 /* 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	11892 * 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	11893 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11894 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	11895 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	11896 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11897 return;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11898 }
775 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 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	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 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	11902 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	11903 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	11904 }
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	11905 #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	11906 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	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 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	11909 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	11910 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	11911 }
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 #endif
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11913 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	11914 {
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 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	11916 }
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 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	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 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	11920 }
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 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	11923 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11924 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	11925 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11926 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	11927 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11928
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11929 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	11930 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	11931 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11932 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	11933 _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	11934 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	11939 * Parameters:
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 * 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	11941 */
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 void dw_signal_disconnect_by_name(HWND window, char *signame)
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 {
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 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	11945 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	11946 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	11947 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	11948
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11949 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11950 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	11951 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	11952 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	11953
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11954 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	11955 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11956 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	11957
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11958 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	11959 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	11960
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11961 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	11962 _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	11963 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11964 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11965 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11966
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11967 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11968 * 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	11969 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11970 * 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	11971 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11972 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	11973 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11974 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	11975 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	11976 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	11977
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11978 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11979 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	11980 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	11981
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11982 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	11983 _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	11984 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	11985 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11986 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11987
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11988 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11989 * 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	11990 * Parameters:
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 * 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	11992 * 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	11993 */
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 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	11995 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11996 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	11997 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	11998 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	11999
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12000 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12001 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	12002 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	12003
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12004 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	12005 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12006 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	12007
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12008 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	12009 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	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 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	12012 _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	12013 }
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 DW_MUTEX_UNLOCK;
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 }
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
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12017 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12018 * 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	12019 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12020 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12021 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12022 * 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	12023 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12024 */
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12025 wchar_t * API dw_utf8_to_wchar(char *utf8string)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12026 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12027 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	12028
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12029 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12030 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	12031 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	12032 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	12033 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12034 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12035 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12036 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12037 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12038 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12039 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12040
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12041 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12042 * 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	12043 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12044 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12045 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12046 * 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	12047 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12048 */
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12049 char * API dw_wchar_to_utf8(wchar_t *wstring)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12050 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12051 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	12052
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12053 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12054 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	12055 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	12056 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	12057 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12058 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12059 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12060 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12061 }
1933 758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12062 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	12063 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1931 diff changeset	12064

Mercurial > dwindows

annotate gtk3/dw.c @ 2005:a17cc1958369