dwindows: gtk3/dw.c annotate

annotate gtk3/dw.c @ 1930:fe04bcfd5b65

GTK3: Need to use cairo region in that new code or else drawing functions crash.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 02 Jun 2017 23:25:15 +0000
parents	25da63f0eddc
children	3a5571255ee6

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 *
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	6 * (C) 2000-2017 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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	35 #ifdef USE_WEBKIT
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	36 #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	37 #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	38
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	39 #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	40
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	41 #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	42 #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	43 #endif
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	44
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	45 #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	46 # 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	47 # 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	48 # 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	49 # 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	50 # 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	51 #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	52
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 #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	54 #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	55 #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	56 #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	57
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 /* 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	59 #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	60 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	61 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	62
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	63 /* 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	64 * 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	65 * 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	66 * 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	67 * 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	68 * 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	69 * 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	70 */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	71 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	72 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	73 { 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	74 { 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	75 { 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	76 { 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	77 { 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	78 { 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	79 { 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	80 { 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	81 { 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	82 { 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	83 { 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	84 { 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	85 { 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	86 { 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	87 { 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	88 { 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	89 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	90
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	91 /*
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 * 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	93 */
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	94 #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	95 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	96 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	97 ".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	98 ".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	99 ".ico",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	100 ".icns",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	101 ".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	102 ".jpg",
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	103 ".jpeg",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	104 ".tiff",
3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	105 ".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	106 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	107
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	108 #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	109 # 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	110 #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	111
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 #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	113 # 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	114 #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	115
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	116 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	117 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	118 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	119
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	120 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	121
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	122 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	123 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	124
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	125 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	126 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	127 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	128
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	129 #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	130 #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	131
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	132 #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	133 #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	134 #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	135
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	136 #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	137 #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	138 #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	139 #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	140
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	141 /* 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	142 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	143 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	144 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	145 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	146 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	147 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	148 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	149 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	150 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	151 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	152 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	153 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	154 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	155 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	156 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	157 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	158 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	159 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	160 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	161
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	163 #ifdef USE_WEBKIT
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	164 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	165 * we need to add these equivalents from webkitwebview.h so we can refer 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	166 * our own pointers to functions (we don't link with the webkit libraries
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	167 */
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 # define DW_WEBKIT_TYPE_WEB_VIEW (_webkit_web_view_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	169 # define DW_WEBKIT_WEB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), DW_WEBKIT_TYPE_WEB_VIEW, WebKitWebView))
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 WEBKIT_API GType (*_webkit_web_view_get_type)(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	171 WEBKIT_API void (_webkit_web_view_load_html_string)(WebKitWebView , const gchar , const gchar ) = NULL;
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 WEBKIT_API void (_webkit_web_view_open)(WebKitWebView , const gchar *) = NULL;
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 WEBKIT_API GtkWidget (_webkit_web_view_new)(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	174 WEBKIT_API void (_webkit_web_view_go_back)(WebKitWebView ) = NULL;
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 WEBKIT_API void (_webkit_web_view_go_forward)(WebKitWebView ) = NULL;
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 WEBKIT_API void (_webkit_web_view_reload)(WebKitWebView ) = NULL;
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 WEBKIT_API void (_webkit_web_view_stop_loading)(WebKitWebView ) = NULL;
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 WEBKIT_API void (_webkit_web_frame_print)(WebKitWebFrame ) = NULL;
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 WEBKIT_API WebKitWebFrame (_webkit_web_view_get_focused_frame)(WebKitWebView *) = NULL;
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 #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	181
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	182 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	183 char *_DWDefaultFont = NULL;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	184 static char _dw_share_path[PATH_MAX+1] = { 0 };
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	185
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	186 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	187 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	188 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	189 char name[30];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	190
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	191 } SignalList;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	192
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	193 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	194 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	195 HWND window;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	196 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	197 gpointer data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	198 gint cid;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	199 void *intfunc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	200
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	201 } SignalHandler;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	202
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	203 #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	204
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	205 /* A list of signal forwarders, to account for paramater differences. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	206 static SignalList SignalTranslate[SIGNALMAX] = {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	207 { _configure_event, DW_SIGNAL_CONFIGURE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	208 { _key_press_event, DW_SIGNAL_KEY_PRESS },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	209 { _button_press_event, DW_SIGNAL_BUTTON_PRESS },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	210 { _button_release_event, DW_SIGNAL_BUTTON_RELEASE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	211 { _motion_notify_event, DW_SIGNAL_MOTION_NOTIFY },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	212 { _delete_event, DW_SIGNAL_DELETE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	213 { _expose_event, DW_SIGNAL_EXPOSE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	214 { _activate_event, "activate" },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	215 { _generic_event, DW_SIGNAL_CLICKED },
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	216 { _container_enter_event, DW_SIGNAL_ITEM_ENTER },
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	217 { _tree_context_event, DW_SIGNAL_ITEM_CONTEXT },
785 a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	218 { _combobox_select_event, DW_SIGNAL_LIST_SELECT },
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	219 { _tree_select_event, DW_SIGNAL_ITEM_SELECT },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	220 { _set_focus_event, DW_SIGNAL_SET_FOCUS },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	221 { _value_changed_event, DW_SIGNAL_VALUE_CHANGED },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	222 { _switch_page_event, DW_SIGNAL_SWITCH_PAGE },
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	223 { _column_click_event, DW_SIGNAL_COLUMN_CLICK },
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 { _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	225 };
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
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 /* 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	228 #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	229 #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	230 #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	231 #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	232 #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	233
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	234 #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	235 /* MDI Support Code */
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	236 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	237 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	238 #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	239 #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	240 #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	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 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	243 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	244 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	245 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	246
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 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	248 {
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 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	250 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	251 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	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
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 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	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	256 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	257 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	258
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	259 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	260 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	261 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	262
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 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	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 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	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 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	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
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 #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	271 #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	272 #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	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 #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	275 #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	276 #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	277 #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	278 #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	279 #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	280 #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	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 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	283
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 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	285 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	286 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	287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	288 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	289 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	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 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	292 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	293 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	294 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	295
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 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	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
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_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	300 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	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 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	303 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	304 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	305 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	306 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	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 /* 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	309 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	310 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	311 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	312 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	313 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	314
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	315 static 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	316 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	317 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	318
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	319 static 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	320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	321 static 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	322 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	323 static 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	324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	325 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	326 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	327
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	328 static 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	329 {
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 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	331 NULL,
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 NULL,
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 (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	334 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	335 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	336 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	337 0,
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 (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	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
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 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	342 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	343 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	344 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	345
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 /* 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	347 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	348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	349 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	350 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	351 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	352 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	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 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	355 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	356
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	357 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	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 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	360 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	361 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	362 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	363 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	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 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	366 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	367 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	368 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	369 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	370
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 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	372 {
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 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	374 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	375 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	376
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	377 static 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	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 *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	380 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	381
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	382 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	383 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	384 _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	385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	386 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	387 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	388
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 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	390 {
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 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	392
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	393 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	394 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	395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	396 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	397 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	398 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	399 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	400 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	401
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	402 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	403 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	404 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	405 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	406
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	407 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	408 child_widget_box = gtk_event_box_new ();
1921 bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	409 #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	410 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	411 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1919 diff changeset	412 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	413 #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	414 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	415 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	416 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	417 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	418 gtk_grid_set_column_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	419
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	420 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	421 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	422 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	423 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	424 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	425
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	426 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	427
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	428 _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	429 _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	430 _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	431 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	432 {
1918 1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	433 _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	434 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	435 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	436 _dw_override_color (label, "color", &color);
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	437 #if GTK_CHECK_VERSION(3,16,0)
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	438 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	439 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	440 #else
1814a6577a5f Import the same changes into the GTK3 MDI code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1917 diff changeset	441 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	442 #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	443
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 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	445 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	446 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	447
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	448
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	449 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	450 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	451 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	452 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	453 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	454 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	455 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	456 gtk_container_add (GTK_CONTAINER (button[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	457 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	458 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	459 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	460 gtk_container_add (GTK_CONTAINER (button[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	461
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	462
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	463 /* 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	464 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	465 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	466 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	467 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	468 gtk_grid_attach (GTK_GRID (grid), button[2], 3, 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	469
1579 245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1578 diff changeset	470 /* 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	471 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	472 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	473 gtk_grid_attach (GTK_GRID (grid), child_widget_box, 0, 1, 4, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	474
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	475 /* 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	476 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	477
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1576 diff changeset	478 gtk_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	479
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 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	481 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	482 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	483 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	484 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	485 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	486 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	487 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	488 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	489
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_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	491 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	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 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	494 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	495 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	496 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	497 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	498 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	499 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	500 gtk_widget_show (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	501 }
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
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	503 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	504 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	505 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	506 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	507 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	508 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	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 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	511 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	512 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 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	514 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	515 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	516 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	517 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	518 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	519 g_signal_connect (G_OBJECT (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	520 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	521 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	522 g_signal_connect (G_OBJECT (button[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	523 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	524 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	525 }
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
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 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	528 {
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 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	530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	531 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	532 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	533
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 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	535 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	536
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	537 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	538 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	539 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	540 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	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
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 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	544 {
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 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	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 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	548 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	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 = 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	551 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	552
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	553 *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	554 *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	555 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	556
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 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	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 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	560
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	561 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	562 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	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 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	565 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	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 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	568 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	569 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	570 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	571
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 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	573 {
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 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	575
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	576 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 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	578 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	579 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	580 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	582 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	583 {
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 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	585 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	586 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	587 GdkWindow *thiswindow;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	588 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	589
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	590 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	591
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	592 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	593 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	594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	595 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	596
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 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	598 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	599 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	600 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	601 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	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	610 attributes_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	611 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	612 gtk_widget_set_window(widget, thiswindow);
415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1177 diff changeset	613
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	614 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	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
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	617 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	618 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	619 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	620 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	621 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	622 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	623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	624 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	625 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	626
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	627 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	628 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	629 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	630 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	631 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	632
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	633 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	634 {
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	635 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	636 }
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 }
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
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 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	641 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	642 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	643 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	644 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	645 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	646
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	647 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	648 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	649
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	650 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	651 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	652 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	653 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	654 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	655
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	656 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	657 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	658 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	659 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	660 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 835 diff changeset	661 }
775 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
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 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	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 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	666 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	667 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	668 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	669 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	670
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	671 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	672
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 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	674
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	675 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	676 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	677 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	678 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	679 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	680 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	681
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	682
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 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	684 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	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 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	687 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	688
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	689 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	690 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	691 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	692 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	693 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	694 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	695 {
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 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	697 {
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 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	699 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	700 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	701 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	702 }
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 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	704 {
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.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	706 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	707 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	708 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	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 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	711 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	712 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	713 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	714 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	715 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	716 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	717 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	718 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	719 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	720 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	721 child_allocation.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	722 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	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 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	725 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	726 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	727 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	728 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	729 child->width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	730 child->height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	731 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	732 child_allocation.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	733 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	734 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	735 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	736 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	739 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	740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	743
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	744 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	745 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	746 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	747 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	748 GtkMdi *mdi;
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	749 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	750
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	751 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	752 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	753 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	754
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	755 mdi = GTK_MDI (widget);
1919 78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	756
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	757 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	758 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	759 GtkAllocation allocation;
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	760
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	761 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	762 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	763 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1918 diff changeset	764
775 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 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	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 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	768 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	769 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	770 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	771 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	772 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	773 }
775 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
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 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	776 {
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 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	778 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	779 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	780 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	781
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 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	783 {
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 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	785 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	786 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	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 = 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	789
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	790 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	791 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	792 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	793 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	794 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	795 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	796
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	797 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	798 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	799
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	800 if(child)
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 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	803 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	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 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	806 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	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
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 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	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 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	812 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	813 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	814
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	815 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	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 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	818
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	819 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	820 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	821 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	822 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	823 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	824
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	825 (*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	826 }
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
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 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	830 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	831 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	832 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	833
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	834 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	835 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	836
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	837 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	838 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	839
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	840
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	841 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	842 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	843 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	844 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	845 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	846 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	847 case GDK_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	848 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	849 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	850 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	851 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	852 #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	853 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	854 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	855 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	856 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	857 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	858 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	859 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	860 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	861 FALSE,
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 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	863 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	864 NULL,
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 event->button.time) != GDK_GRAB_SUCCESS)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	866 #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	867 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	868
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	869 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	870
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	871 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	872 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	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 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	875
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 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	877 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	878 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	879
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	880 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	881 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	882 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	883
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	884 #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	885 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	886 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	887 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	888 #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	889 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	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 = 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	892 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	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 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	895 }
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 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	897
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	898 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	899 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	900 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	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 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	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
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	905 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	906
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	907
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 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	909 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	910
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	911
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	912 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	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 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	915
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	916 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	917 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	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
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 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	921 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	922
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	923 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	924 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	925 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	926 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	927
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	928 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	929 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	930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	931 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	932 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	933
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	934 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	935 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	936 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	937 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	938 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	939 #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	940 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	941 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	942 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	943 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	944 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	945 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	946 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	947 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	948 FALSE,
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 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	950 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	951 NULL,
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 event->button.time) != GDK_GRAB_SUCCESS)
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	953 #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	954 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	955
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 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	957 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	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 GtkAllocation allocation;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	960
775 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 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	962 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	963 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	964 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	965 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	966 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	967 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	968
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	969 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	970 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	971
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	972 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	973 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	974 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	975
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	976 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	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 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	979 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	980
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	981 #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	982 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	983 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	984 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	985 #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	986 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	987
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 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	989 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	990 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	991
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	992 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	993 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	994
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 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	996 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	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 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	999
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 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	1001 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1002 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	1003 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	1004 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	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 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	1007 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	1008
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1009 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	1010
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1011 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	1012 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	1013 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	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 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	1016 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	1017
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 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	1019 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	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 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	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 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	1024 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	1025 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1026
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 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	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_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	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_ICONIFIED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1041 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1042 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 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	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 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	1051 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	1052 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1053 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	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 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	1056 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1057 child->state = CHILD_MAXIMIZED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1058 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1059 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	1060 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	1061 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	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
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 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	1065 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1066 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	1067 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	1068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1069 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	1070 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	1071
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1072 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	1073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1074 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	1075 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	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
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 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	1079 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1080 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	1081
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1082 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	1083 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	1084 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1085 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	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 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	1088 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	1089
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1090 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	1091 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	1092 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1093
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1094 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	1095 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	1096 #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	1097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1098 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	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 #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	1101 /* 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	1102 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	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 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	1105 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	1106 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1452 diff changeset	1107 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	1108 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	1109 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1110 req.tv_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	1111
775 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 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	1113 #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	1114 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	1115 #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	1116 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1117
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1118 /* 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	1119 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	1120 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1121 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	1122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1123 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	1124 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1125 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	1126 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	1127 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1128 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	1129 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1130
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1131 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	1132 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1133 SignalHandler sh = {0};
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1134
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1135 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1136 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1137 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1138 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	1139 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	1140 char text[100];
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1141
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1142 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	1143 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	1144 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	1145 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	1146 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	1147 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	1148 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	1149 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	1150 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	1151 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	1152 }
775 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 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	1154 }
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
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 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	1157 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1158 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	1159 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	1160
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1161 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	1162 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	1163 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	1164 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	1165 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	1166 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	1167 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	1168 g_object_set_data(G_OBJECT(widget), text, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1169 sprintf(text, "_dw_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	1170 g_object_set_data(G_OBJECT(widget), text, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1171 sprintf(text, "_dw_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, NULL);
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
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1175 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	1176 {
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	1177 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	1178 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	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 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	1181 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	1182 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	1183 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	1184 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	1185 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	1186 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	1187 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	1188 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	1189 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	1190
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 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	1192 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	1193
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 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	1195 }
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 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	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 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	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 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	1202 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	1203 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1204
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1205 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	1206 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1207 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	1208 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	1209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1210 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	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 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	1213
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 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	1215 }
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 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	1217 }
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 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	1220 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1221 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	1222 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	1223
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1224 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	1225 {
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 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	1227 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	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 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	1230 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	1231 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	1232 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	1233
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 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	1235 }
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 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	1237 }
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 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	1240 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1241 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	1242 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	1243
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1244 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	1245 {
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 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	1247 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	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 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	1250 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	1251 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	1252 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	1253
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1254 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	1255 }
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 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	1257 }
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
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 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	1260 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1261 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	1262 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	1263
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(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	1265 {
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 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	1267 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	1268 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	1269
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 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	1271 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	1272 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	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 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	1275 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	1276 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	1277 }
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 (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	1280 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	1281 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	1282 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	1283 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	1284 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	1285
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 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	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 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	1289 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1290
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 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	1292 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1293 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	1294 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	1295
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1296 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	1297 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1298 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	1299
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1300 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	1301 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1302 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	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
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 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	1306 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1307 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	1308 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	1309
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 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	1311 {
1747 f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1312 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	1313 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	1314 char utf8[7] = { 0 };
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1315
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1316 g_unichar_to_utf8(unichar, utf8);
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1745 diff changeset	1317
775 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 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	1319 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	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 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	1322 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1323
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 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	1325 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1326 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	1327 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	1328
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 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	1330 {
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 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	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 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	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 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	1336 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1338 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	1339 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1340 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	1341 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	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 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	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 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	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 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	1348 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	1349 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1350 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1353 static gint _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	1354 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1355 SignalHandler work = _get_signal_handler(data);
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1356 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1357
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1358 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1359 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1360 int (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	1361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1362 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	1363 }
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 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	1365 }
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
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1367 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	1368 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1369 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	1370 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	1371
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1372 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	1373 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1374 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	1375 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	1376
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	1377 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	1378 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	1379 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	1380 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	1381 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1382 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	1383 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1384
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	1385 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	1386 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1387 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	1388 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	1389
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1390 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	1391 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	1392
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	1393 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	1394 {
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	1395 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	1396
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	1397 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	1398 {
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	1399 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	1400 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1401
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1402 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	1403
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1404 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	1405 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1406 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	1407
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1408 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	1409 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1410 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	1411
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1412 if(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1413 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1414 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	1415
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1416 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	1417 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	1418 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	1419 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1420 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1421
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	1422 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	1423 }
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	1424 }
775 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 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	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
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1428 #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	1429 #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	1430
775 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 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	1432 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1433 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	1434 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	1435
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1436 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	1437 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1438 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	1439 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1440 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	1441 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	1442 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	1443
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1444 if(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	1445 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1446 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	1447 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	1448 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	1449
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1450 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	1451 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	1452 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1453 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	1454 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1455 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	1456 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1457 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	1458 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1459 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	1460 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1461 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1462 else
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 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1465
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1466 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	1467 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1468 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1469 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1470
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1471 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	1472 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1473 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	1474 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1475 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	1476 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1477 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1478 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1479 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	1480 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1481 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1482 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1483 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1484 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1485 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1486
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1487 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	1488 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1489 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	1490 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1491 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1492 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	1493 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1494
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1495 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	1496 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1497 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	1498 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	1499
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1500 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	1501 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1502 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	1503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1504 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	1505 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1506 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	1507 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	1508 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	1509 void *itemdata = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1510 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	1511
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1512 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	1513 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1514 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	1515 return TRUE;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1516 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1517
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1518 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	1519 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	1520 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1521 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	1522 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1523 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	1524 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	1525 }
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 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	1527 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1528 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	1529 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	1530 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1531 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1532 {
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	1533 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	1534
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	1535 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	1536 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1537 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	1538
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	1539 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	1540 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1541 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	1542
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	1543 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	1544 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1545 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	1546 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	1547 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1548 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1549 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1550 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1551 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1552
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1553 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	1554 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1555 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1556 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1557
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1558 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	1559 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1560 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	1561 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1562 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	1563 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	1564 }
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	1565 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	1566 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1567 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	1568 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	1569 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1570 else
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1571 {
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	1572 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	1573
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	1574 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	1575 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 784 diff changeset	1576 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	1577
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	1578 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	1579 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1580 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1581 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1582 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1583 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1584 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1585 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1586 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	1587 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1588 }
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 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	1590 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1591
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1592 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	1593 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1594 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	1595 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	1596
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1597 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	1598 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1599 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	1600 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	1601 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1602 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	1603 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1604
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1605 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	1606 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1607 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	1608 GdkEventKey keyevent = (GdkEventKey )event;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1609 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	1610 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	1611
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1612 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	1613 {
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1614 /* 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	1615 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	1616 (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	1617 {
1881 653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1875 diff changeset	1618 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	1619 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	1620 void *data = NULL;
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1621
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1622 /* 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	1623 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	1624 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1625 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	1626 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1627
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1628 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1629 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	1630 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1631 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1632 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	1633
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1634 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	1635 if(path)
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1636 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1637 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1638
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1639 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	1640 {
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1641 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	1642 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1643 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	1644 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	1645 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	1646 g_free(text);
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1647 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1648 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1649 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1650 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1651 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1652 }
9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	1653 }
775 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 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	1655 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1656
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 /* 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	1658 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	1659 {
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 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	1661 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	1662 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	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(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	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 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	1667 {
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 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	1669 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1672 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	1673 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1674
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1676 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	1677 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1678 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	1679 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	1680
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1681 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	1682 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1683 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	1684 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	1685 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1686 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	1687 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1688
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	1689 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	1690 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1691 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	1692 int retval = FALSE;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1693
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1694 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1695 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1696 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	1697 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	1698
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1699 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1700 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1701 SignalHandler work;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1702
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1703 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	1704 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	1705
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1706 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1707 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1708 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	1709 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	1710 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	1711 }
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	1712 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1713 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1714 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	1715 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1716
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1717 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	1718 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1719 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	1720
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1721 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	1722 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	1723
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1724 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	1725 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1726
1578 36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1727 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	1728 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1729 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	1730 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	1731 int max, val;
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1732
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1733 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	1734 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(widget), "_dw_adjustment");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1735
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1736 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	1737 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	1738 scrollbar = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_scrollbar");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1739
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1740 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	1741 val = _round_value(gtk_adjustment_get_value(adjustment));
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1577 diff changeset	1742
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1743 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	1744 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1745
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	1746 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	1747 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	1748 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	1749
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1750 if (work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1751 {
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 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	1753
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	1754 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	1755 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	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 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1763 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	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 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	1766
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1767 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	1768 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1769 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	1770 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1771 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	1772 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	1773 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	1774 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	1775 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1776 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1777 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	1778 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1779
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1780 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	1781 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1782 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	1783 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	1784
1289 5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1785 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1786 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1787 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1287 diff changeset	1788
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1789 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	1790 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1791 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	1792
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1793 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	1794 *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	1795 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	1796 *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	1797
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	1798 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	1799 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1800
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 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	1802 {
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 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	1804 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1805 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	1806 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	1807 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1808 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1809
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1810 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	1811 {
1327 e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1812 GdkPixbuf *icon_pixbuf;
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1813
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1814 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	1815 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	1816 else
e4ef8d86dfc4 Added support for GdkPixbuf inline data in GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1322 diff changeset	1817 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	1818
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1819 if(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	1820 *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	1821 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	1822 *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	1823
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1824 return 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	1825 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1826 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	1827 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1828
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1829 /* Try to load the WebKitGtk shared libary */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1830 #ifdef USE_WEBKIT
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1831 void init_webkit(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	1832 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1833 char libname[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	1834 void *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	1835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1836 sprintf( libname, "lib%s.so", WEBKIT_LIB);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1837 handle = dlopen( libname, RTLD_LAZY );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1839 /* If we loaded it, grab the symbols we 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	1840 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	1841 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1842 _webkit_web_view_get_type = dlsym( handle, "webkit_web_view_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	1843 _webkit_web_view_load_html_string = dlsym( handle, "webkit_web_view_load_html_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	1844 _webkit_web_view_open = dlsym( handle, "webkit_web_view_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	1845 _webkit_web_view_new = dlsym( handle, "webkit_web_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	1846 _webkit_web_view_go_back = dlsym( handle, "webkit_web_view_go_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	1847 _webkit_web_view_go_forward = dlsym( handle, "webkit_web_view_go_forward" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1848 _webkit_web_view_reload = dlsym( handle, "webkit_web_view_reload" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1849 _webkit_web_view_stop_loading = dlsym( handle, "webkit_web_view_stop_loading" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1850 _webkit_web_frame_print = dlsym( handle, "webkit_web_frame_print" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1851 _webkit_web_view_get_focused_frame = dlsym( handle, "webkit_web_view_get_focused_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	1852 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1853 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1854 #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	1855
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1856 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1857 * 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	1858 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1859 * 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	1860 * 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	1861 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1862 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	1863 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1864 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	1865 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1866 _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	1867 _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	1868 _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	1869 }
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1870
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1871 /* 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	1872 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	1873 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1874 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	1875 char *pos = strrchr(pathcopy, '/');
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1876 char *binname = pathcopy;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1877
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1878 /* If we have a / then...
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1879 * 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	1880 */
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1881 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1882 {
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1883 binname = pos + 1;
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1884 *pos = 0;
1506 308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1885 }
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1886
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1887 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1888 {
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1889 char *binpos = strstr(pathcopy, "/bin");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1890
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1891 if(binpos)
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1892 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	1893 else
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1894 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1895 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1505 diff changeset	1896 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	1897 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1898 if(pathcopy)
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1899 free(pathcopy);
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1900 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1901 /* 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	1902 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	1903 _dw_share_path[0] = '/';
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	1904
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	1905 #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	1906 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	1907 #endif
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1908
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1909 /* 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	1910 _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	1911 _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	1912 _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	1913
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1914 _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	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 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	1917
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	1918 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	1919 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	1920 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	1921
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	1922 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	1923
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	1924 /* 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	1925 _DWObject = g_object_new(G_TYPE_OBJECT, 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	1926
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1927 #ifdef USE_WEBKIT
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 init_webkit();
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 #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	1930
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1931 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	1932 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1933
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1934 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1935 * 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	1936 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1937 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	1938 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1939 _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	1940 _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	1941 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	1942 _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	1943 _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	1944 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1945
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1946 /*
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1947 * 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	1948 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1949 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	1950 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1951 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	1952 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1953
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1954 /*
775 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 * 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	1956 * Parameters:
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 * 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	1958 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	1959 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	1960 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1961 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	1962 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	1963
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1964 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	1965
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1966 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	1967 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1968 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	1969
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1970 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	1971
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1972 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	1973 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1974 int _locked_by_me = FALSE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1975
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1976 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	1977 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1978 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	1979 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	1980 _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	1981 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	1982 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1983 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1984 _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	1985 }
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1986 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	1987 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	1988 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	1989 _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	1990 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	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 _dw_thread = orig;
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1993 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1994 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	1995 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	1996 _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	1997 }
775 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 }
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 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	2000 }
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 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	2003 _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	2004 }
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
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 /*
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 * 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	2008 */
1528 5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1524 diff changeset	2009 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	2010 {
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2011 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	2012 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	2013 int _locked_by_me = FALSE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2014
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2015 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	2016 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2017 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	2018 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	2019 _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	2020 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	2021 _locked_by_me = TRUE;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2022 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2023 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2024 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2025 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	2026 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2027 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2028 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2029 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	2030 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2031 _dw_thread = orig;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2032 if(_locked_by_me)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2033 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2034 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	2035 _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	2036 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	2037 }
775 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 }
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
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 * 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	2042 * Parameters:
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 * 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	2044 * 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	2045 */
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 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	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 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	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
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 /*
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 * 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	2053 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2054 * 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	2055 */
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 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	2057 {
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 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	2059
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 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	2061 {
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 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	2063 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	2064 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	2065 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	2066 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	2067 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	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 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	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
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 /*
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 * 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	2074 * 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	2075 * Parameters:
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 * 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	2077 * 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	2078 */
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 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	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 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	2082 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	2083 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	2084 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	2085 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	2086 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	2087 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	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
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 * 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	2092 * 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	2093 * Parameters:
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 * 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	2095 */
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 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	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 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	2099 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	2100
1886 f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	2101 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	2102 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	2103
775 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 /* _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	2105 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	2106 {
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_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	2108 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	2109 _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	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
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 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	2113 {
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 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	2115 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	2116 }
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 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	2118 {
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 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	2120 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	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 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	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 _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	2126 _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	2127 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2129 dw_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	2130 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	2131 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	2132 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	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 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	2136 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2137 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	2138
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2139 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	2140 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	2141
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2142 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	2143 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	2144 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	2145 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2146
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2147 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	2148 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2149 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	2150
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2151 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	2152 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	2153
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 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	2155 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	2156 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	2157 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2158
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 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	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 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	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 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	2164 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	2165
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 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	2167 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	2168 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	2169 }
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
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 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	2172 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2173 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	2174
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2175 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	2176 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	2177
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_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	2179 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	2180 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	2181 }
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 /*
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	2184 * 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	2185 * 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	2186 * 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	2187 * ...: 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	2188 */
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	2189 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	2190 {
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	2191 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	2192 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	2193
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	2194 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	2195 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	2196 va_end(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	2197
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	2198 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	2199 }
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	2200
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	2201 /*
775 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 * 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	2203 * Parameters:
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 * 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	2205 * 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	2206 * 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	2207 * ...: 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	2208 */
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 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	2210 {
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 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	2212 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	2213 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	2214 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	2215 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	2216 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	2217 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	2218 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	2219
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 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	2221 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	2222 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	2223
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2224 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	2225 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	2226 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	2227
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2228 /* 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	2229 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	2230 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2231 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	2232 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	2233 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	2234 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2235 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	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 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	2238 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	2239 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2240
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 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	2242 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	2243 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	2244 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	2245 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	2246 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	2247 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	2248 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	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 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	2251 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	2252
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 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	2254 {
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 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	2256 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	2257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2258 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	2259
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2260 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	2261 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2262
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2263 /* 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	2264 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	2265 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	2266 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	2267 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	2268 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	2269
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	2270 text_width = min( width, dw_screen_width() - extra_width - 100 );
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	2271 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	2272
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2273 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	2274
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 /* 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	2276 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	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_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	2279
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2280 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	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 /* 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	2283 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	2284 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2285 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	2286 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	2287 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	2288 }
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 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	2290 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2291 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	2292 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	2293 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	2294 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	2295 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	2296 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	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 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	2299 {
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 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	2301 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	2302 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	2303 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	2304 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	2305 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	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 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	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 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	2310 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	2311 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	2312 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	2313 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	2314 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	2315 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	2316 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	2317 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	2318 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2320 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	2321 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	2322 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	2323
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 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	2325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2326 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	2327
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	2328 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	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 * 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	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 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	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_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	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;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2339 #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	2340 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	2341 #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	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 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	2344 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	2345
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 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	2347 #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	2348 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	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 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	2351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2352 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2353 #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	2354 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2355 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	2356 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2357 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2358 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	2359 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2360
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 * 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	2363 * Parameters:
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 * 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	2365 */
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 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	2367 {
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 int _locked_by_me = FALSE;
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 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	2371 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	2372
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2373 DW_MUTEX_LOCK;
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 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	2375 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2376 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	2377 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2378
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2379 /*
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 * 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	2381 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2382 * 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	2383 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2384 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	2385 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2386 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2387
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2388 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	2389 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	2390
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2391 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2392 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	2393 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2394 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	2395 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2396
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2397 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2398 * 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	2399 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2400 * 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	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 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	2403 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2404 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2405 GtkWidget *defaultitem;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2406 #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	2407 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2408 #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	2409
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2410 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	2411 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	2412
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2413 DW_MUTEX_LOCK;
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 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	2415 #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	2416 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	2417 {
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 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	2419 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2420 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2421 #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	2422 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2423 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	2424 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	2425 {
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	2426 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	2427 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	2428
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2429 /* 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	2430 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	2431 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2432 /* 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	2433 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	2434 /* 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	2435 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	2436 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	2437 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2438
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2439 /* 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	2440 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	2441 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2442 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	2443 int y = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_y"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2444
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2445 /* 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	2446 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	2447 /* 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	2448 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	2449 }
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
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2451 gdk_window_raise(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	2452 gdk_flush();
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	2453 gdk_window_show(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	2454 gdk_flush();
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 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	2457 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	2458 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	2459 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2460 DW_MUTEX_UNLOCK;
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 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2465 * 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	2466 * Parameters:
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 * 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	2468 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2469 int 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	2470 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2471 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	2472 #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	2473 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	2474 #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	2475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2476 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	2477 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2478
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2479 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	2480 #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	2481 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	2482 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2483 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	2484 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2485 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2486 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2487 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	2488 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2489 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2490 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2491
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2492 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2493 * 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	2494 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2495 * handle: The window handle to 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	2496 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2497 int dw_window_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	2498 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2499 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	2500 #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	2501 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	2502 #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	2503
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2504 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	2505 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	2506
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2507 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	2508 #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	2509 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	2510 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2511 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	2512 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	2513 #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	2514 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	2515 {
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	2516 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	2517 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	2518
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	2519 /* 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	2520 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	2521 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	2522
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2523 /* Check if we are removing a widget from a 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	2524 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	2525 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2526 /* 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	2527 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2528 #if GTK_CHECK_VERSION(3,10,0)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2529 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	2530 int z;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2531
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2532 /* 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	2533 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	2534 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2535 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	2536 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2537 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	2538 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2539 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	2540 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2541 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2542 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2543 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2544 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2545 {
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	2546 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	2547 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2548 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	2549 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2550 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	2551 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2552 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2553 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2554 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	2555 #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	2556
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2557 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	2558 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2559 /* 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	2560 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	2561 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	2562 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2563 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2564 /* Finally destroy the widget */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	2565 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	2566 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2567 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2568 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	2569 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2570
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2571 /* 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	2572 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2573 * handle: 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	2574 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2575 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	2576 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2577 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2578
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2579 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2580 * 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	2581 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2582 * 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	2583 * 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	2584 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2585 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	2586 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2587 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2588
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2589 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	2590 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	2591 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2592 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2593
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2594 /*
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2595 * 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	2596 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2597 * 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	2598 */
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2599 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	2600 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2601 char *oldfont = _DWDefaultFont;
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2602
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2603 _DWDefaultFont = strdup(fontname);
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2604
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2605 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	2606 free(oldfont);
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2607 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2608
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	2609 /* 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	2610 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	2611 {
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	2612 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	2613
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	2614 /* 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	2615 * 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	2616 * 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	2617 */
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	2618 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	2619 {
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	2620 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	2621 *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	2622 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	2623 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	2624 }
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	2625 }
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	2626
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2627 /* 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	2628 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	2629 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2630 if(color)
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2631 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2632 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	2633 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	2634 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	2635
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2636 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	2637 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	2638 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	2639 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	2640 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	2641 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2642 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2643
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2644 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	2645 {
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2646 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	2647 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	2648
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2649 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	2650 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	2651 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	2652 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	2653 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2654
1076 dbaf1b11c301 Added stub dw_font_set_default() functions for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1072 diff changeset	2655 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2656 * 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	2657 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2658 * 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	2659 * 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	2660 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2661 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	2662 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2663 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	2664 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	2665 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2666 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	2667
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2668 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2669 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	2670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2671 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	2672 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	2673 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	2674 }
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	2675 /* 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	2676 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	2677 {
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	2678 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	2679 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	2680 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	2681 }
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2682 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	2683 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	2684 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	2685 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	2686 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	2687 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2688
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	2689 _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	2690
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2691 /* 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	2692 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	2693 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	2694 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	2695 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	2696
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2697 _dw_override_font(handle2, font);
98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2698
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2699 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2700 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	2701 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2702
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	2703 /* 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	2704 * 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	2705 * 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	2706 * 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	2707 * 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	2708 */
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	2709 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	2710 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2711 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	2712 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	2713 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	2714 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	2715 char *retfont = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2716
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2717 /* 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	2718 * 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	2719 * 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	2720 */
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	2721 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	2722 {
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	2723 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	2724 *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	2725 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	2726 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	2727 }
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	2728
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	2729 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	2730 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	2731 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	2732 {
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2733 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	2734 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	2735 }
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2736
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	2737 gtk_widget_show(GTK_WIDGET(fd));
1576 85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2738
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2739 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	2740 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2741 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	2742 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	2743 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2744 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	2745 /* 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	2746 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	2747 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2748 int size, x=len-1;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2749
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2750 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	2751 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2752 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2753 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2754 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	2755 /* 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	2756 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	2757 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2758 /* 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	2759 * 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	2760 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2761 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	2762 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	2763 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2764 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2765 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	2766 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2767 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1575 diff changeset	2768 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	2769 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2770 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2771 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1046 diff changeset	2772
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2773 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2774 * 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	2775 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2776 * 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	2777 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2778 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	2779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2780 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	2781 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	2782 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	2783 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	2784 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	2785 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	2789 {
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 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	2791 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	2792 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	2793 }
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	2794 /* 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	2795 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	2796 {
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	2797 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	2798 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	2799 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	2800 }
775 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 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	2803 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	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 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	2806 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	2807 {
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	2808 int len, x;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2809
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2810 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	2811 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	2812 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	2813 /* 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	2814 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	2815 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1022 diff changeset	2816 int size;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	2817
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	2818 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	2819 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	2820 {
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	2821 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	2822 }
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	2823 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	2824 /* 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	2825 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	2826 {
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	2827 /* 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	2828 * 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	2829 */
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	2830 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	2831 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	2832 }
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	2833 }
775 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 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	2835 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2837 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2838 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	2839 }
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
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 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	2842 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2843 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	2844
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2845 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	2846 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	2847
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2848 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	2849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2850 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	2851 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	2852 }
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 /* 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	2855 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	2856 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2857 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	2858 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	2859
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 _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	2861
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 *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	2863 *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	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 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	2866 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	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
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 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	2870 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2871 /* 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	2872 * 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	2873 */
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	2874 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	2875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2876 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	2877 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2878 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	2879 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	2880 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	2881 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	2882 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2883 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	2884 forecolor = _colors[fore];
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	2885
1915 98579be1198e Experimental change to use CSS to change widget colors on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1913 diff changeset	2886 _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL);
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	2887
775 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 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	2889 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	2890 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	2891 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	2892 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	2893 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	2894 }
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 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	2896 backcolor = _colors[back];
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	2897
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	2898 _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	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 _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	2901
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 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	2903 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2904 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2905 * 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	2906 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2907 * 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	2908 * 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	2909 * 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	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 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	2912 {
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 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	2914 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2915
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2916 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2918 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	2919 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2920 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	2921 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	2922 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	2923 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	2924 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	2925 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2926 GtkWidget tmp = (GtkWidget )g_object_get_data(G_OBJECT(handle), "_dw_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	2927 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	2928 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2929 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	2930 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	2931 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2932 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2933
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2934 _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	2935
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 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	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 /*
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 * 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	2942 * Parameters:
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 * 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	2944 * 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	2945 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2946 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	2947 {
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 /* 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	2949 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	2950 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2951
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2952 #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	2953 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2954 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2955 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2956 #endif
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2957
775 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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2959 * 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	2960 * Parameters:
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 * 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	2962 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2963 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	2964 {
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 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2968 #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	2969 _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	2970 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2971 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2972 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2973 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2974 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2975 _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	2976 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	2977 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	2978 GDK_OWNERSHIP_WINDOW,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2979 FALSE,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2980 GDK_BUTTON_RELEASE_MASK \| GDK_BUTTON_PRESS_MASK \| GDK_POINTER_MOTION_MASK \| GDK_POINTER_MOTION_HINT_MASK,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2981 NULL,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	2982 GDK_CURRENT_TIME);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	2983 #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	2984 DW_MUTEX_UNLOCK;
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 /*
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 * 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	2989 * Parameters:
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 * 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	2991 * 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	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 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	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 int _locked_by_me = FALSE;
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 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	2997
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2998 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	2999 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	3000 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	3001 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	3002 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	3003 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3004 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	3005 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	3006 else
1912 5035750bcc65 Fix some deprecation warnings in recent GTK3 versions... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1900 diff changeset	3007 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	3008 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	3009 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	3010 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	3011 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	3012 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3013 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3015 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3016 * 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	3017 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3018 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	3019 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3020 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3022 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3023 #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	3024 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3025 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3026 _dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3027 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3028 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	3029 manager = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3030 #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	3031 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	3036 * Parameters:
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 * 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	3038 * 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	3039 * 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	3040 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3041 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	3042 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3043 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	3044 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3045 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	3046
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3047 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	3048 #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	3049 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	3050 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3051 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	3052
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3053 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	3054
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3055 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	3056 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	3057 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	3058 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	3059 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	3060
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 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	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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3064 #endif
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3065 {
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3066 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	3067 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	3068
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 gtk_widget_show_all(grid);
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	3070
775 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 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	3072
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 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	3074 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	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 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	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 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	3079 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	3080
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 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	3082 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	3083
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3084 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	3085 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	3086
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	3087 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	3088 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	3089
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 if(flStyle & DW_FCF_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	3091 gtk_window_maximize(GTK_WINDOW(tmp));
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	3092
775 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 if(flStyle & DW_FCF_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	3094 gtk_window_iconify(GTK_WINDOW(tmp));
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	3095
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	3096 /* 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	3097 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	3098
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3099 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	3100 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	3101 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	3102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3103 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	3104 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	3105
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 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	3107 g_object_set_data(G_OBJECT(tmp), "_dw_size", GINT_TO_POINTER(1));
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3108
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	3109 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	3110 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	3111 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	3112 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	3113 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	3114 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3115 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	3116 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	3122 * Parameters:
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 * 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	3124 * 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	3125 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3126 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	3127 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3128 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	3129 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3130
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3131 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	3132 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	3133 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	3134
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3135 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	3136 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	3137 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	3138 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	3139 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	3140 DW_MUTEX_UNLOCK;
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 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	3142 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3143
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 /*
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 * 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	3146 * Parameters:
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 * 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	3148 * 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	3149 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3150 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	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 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	3153 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	3157 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	3158
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3159 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	3160 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	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 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	3163 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	3164 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	3165 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	3166 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	3167
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	3168 #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	3169 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	3170 #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	3171 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	3172 #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	3173 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	3174 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	3175 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	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_UNLOCK;
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 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	3179 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3181 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3182 * 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	3183 * Parameters:
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 * 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	3185 * 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	3186 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3187 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	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 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	3190 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	3191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3192 if (!handle)
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 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	3194
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 DW_MUTEX_LOCK;
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 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	3197 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	3198 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	3199 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	3200 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	3201 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	3202 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3203 return 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	3204 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3205
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3206 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3207 * 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	3208 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3209 * 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	3210 * 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	3211 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3212 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	3213 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3214 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	3215 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	3216
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3217 if (!handle)
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 -1;
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3221 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	3222 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	3223 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	3224 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	3225 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	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 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	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 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	3235 * Parameters:
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 * 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	3237 * 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	3238 * 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	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 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	3241 {
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	3242 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	3243 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	3247 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	3248 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	3249
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3250 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	3251 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	3252 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	3253 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	3254 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	3255 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	3256 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	3257 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	3258 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	3259 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	3260 DW_MUTEX_UNLOCK;
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 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	3262 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3263
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3264 #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	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 * 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	3267 * Parameters:
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 * 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	3269 */
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 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	3271 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3272 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	3273 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3274
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3275 DW_MUTEX_LOCK;
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 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	3277 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	3278 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3279 return tmp;
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 }
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	3281 #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	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 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	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 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	3287 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3288 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	3289 {
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 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	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
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 DW_MUTEX_LOCK;
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 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	3295 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	3296 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	3297 DW_MUTEX_UNLOCK;
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 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	3299 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3300
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 /*
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 * 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	3303 * Parameters:
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 * 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	3305 * 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	3306 */
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 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	3308 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3309 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	3310 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	3314 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	3315 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	3316 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	3317 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	3318 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	3319 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	3320 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	3321 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	3322 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3323 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	3324 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3326 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3327 * 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	3328 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3329 * 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	3330 * 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	3331 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3332 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	3333 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3334 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3335 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	3336 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	3337
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 DW_MUTEX_LOCK;
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 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	3340 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	3341 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	3342 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	3343 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	3344 DW_MUTEX_UNLOCK;
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 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	3346 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3347
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3348 /*
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 * 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	3350 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3351 * 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	3352 * 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	3353 * 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	3354 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3355 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	3356 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3357 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3358 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	3359 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3360 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	3361
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3362 DW_MUTEX_LOCK;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3363 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	3364 (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	3365 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3366 /* 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	3367 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	3368 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	3369 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	3370 /* 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	3371 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	3372 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	3373 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	3374 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	3375 /* 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	3376 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	3377 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	3378 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	3379 }
775 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 DW_MUTEX_UNLOCK;
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 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	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 /*
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 * 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	3386 * Parameters:
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 * 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	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 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	3390 {
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 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	3392 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3393 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	3394 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	3395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3396 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	3397 /* 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	3398 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	3399 (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	3400 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	3401 /* 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	3402 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	3403 *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	3404 DW_MUTEX_UNLOCK;
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 }
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 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	3409 {
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 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	3411 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	3412
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3413 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	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 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	3416 {
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 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	3418 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	3419 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3420 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 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3422 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	3423 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	3424 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	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 }
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 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	3428 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	3429 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3430
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3431 /*
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 * 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	3433 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3434 * 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	3435 * 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	3436 * 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	3437 * 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	3438 * 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	3439 * 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	3440 * 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	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 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	3443 {
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 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	3445 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	3446 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	3447 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	3448
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 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	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 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	3452 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	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
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3456 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	3457
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3458 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	3459 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	3460
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3461 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	3462 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	3463 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	3464 {
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	3465 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	3466
775 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 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	3468 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3469 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	3470 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	3471 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3472 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	3473 #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	3474 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	3475 #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	3476 }
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	3477 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	3478 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	3479 }
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 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	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 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	3483 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	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 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	3486 #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	3487 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	3488 #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	3489 }
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	3490 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	3491 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	3492 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3493 }
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
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 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	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 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	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};
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	3500
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	3501 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	3502 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	3503 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	3504 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	3505 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	3506 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3507
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3508 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	3509 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	3510 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	3511 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	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 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	3514 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	3515 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3516 * 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	3517 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3518 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	3519 {
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 _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	3521 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	3522 _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	3523 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3524
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3525 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	3526 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	3527
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 DW_MUTEX_UNLOCK;
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 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	3530 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3531
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3532 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	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 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	3535 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	3536
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3537 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	3538 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	3539
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3540 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	3541 {
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	3542 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	3543 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	3544
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	3545 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	3546
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3547 if((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	3548 {
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 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	3550 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	3551 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3553 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	3554 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3555
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 /*
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 * 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	3558 * Parameters:
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 * 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	3560 * 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	3561 * 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	3562 * 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	3563 */
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 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	3565 {
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	3566 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	3567 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	3568 int _locked_by_me = FALSE;
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
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 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	3571 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	3572
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3573 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	3574 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	3575 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	3576
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 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	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 _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	3580 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	3581 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	3582 _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	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_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	3589 * Parameters:
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 * 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	3591 * 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	3592 * 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	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 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	3595 {
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	3596 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	3597 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	3598 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	3599 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3601 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	3602 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	3603
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3604 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	3605 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	3606 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	3607
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3608 if ( (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	3609 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3610 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	3611 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	3612 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	3613 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	3614
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3615 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	3616 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3617 _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	3618 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	3619 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	3620 _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	3621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3622 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3623 if ( (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	3624 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3625 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	3626 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3627 _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	3628 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	3629 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	3630 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	3631 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	3632 _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	3633 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3634 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3635 DW_MUTEX_UNLOCK;
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
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 /*
1373 bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3639 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3640 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3641 * 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	3642 * id: Menuitem id.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3643 * Returns:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3644 * 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	3645 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3646 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	3647 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3648 char numbuf[11];
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3649 GtkWidget *tmphandle;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3650 int _locked_by_me = FALSE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3651 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3652
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3653 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3654 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3655
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3656 DW_MUTEX_LOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3657 snprintf(numbuf, 10, "%lu", id);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3658 tmphandle = _find_submenu_id(menu, numbuf);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3659
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3660 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3661 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3662 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3663 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	3664 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3665 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3666 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3667 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3668 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3669
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1358 diff changeset	3670 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3671 * 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	3672 * Parameters:
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 * 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	3674 * 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	3675 * 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	3676 * 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	3677 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3678 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	3679 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3680 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3681
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3682 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	3683 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	3684
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3685 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	3686
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3687 DW_MUTEX_LOCK;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3688 #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	3689 GdkRectangle rc = { x, y, 1, 1 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3690 gtk_menu_popup_at_rect(GTK_MENU(*menu), gtk_widget_get_window(parent),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3691 &rc, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3692 #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	3693 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	3694 #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	3695 *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	3696 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3697 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3698
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 /*
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 * 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	3702 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3703 * 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	3704 * 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	3705 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3706 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	3707 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3708 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	3709 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	3710 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	3711 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3712 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3713 #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	3714 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3715 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3716 GdkDeviceManager *manager;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3717 #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	3718
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3719 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3720 #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	3721 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3722 #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	3723 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	3724 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3725 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3726 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	3727 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	3728 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3729 gdk_window_get_device_position(gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3730 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	3731 #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	3732 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	3733 *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	3734 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	3735 *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	3736 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	3741 * Parameters:
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 * 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	3743 * 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	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 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	3746 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3747 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	3748 GdkDisplay *display;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3749 GdkDevice *device;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3750 #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	3751 GdkSeat *seat;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3752 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3753 GdkDeviceManager *manager;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3754 #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	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 DW_MUTEX_LOCK;
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 #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	3758 display = gdk_display_get_default();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3759 #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	3760 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	3761 device = gdk_seat_get_pointer(seat);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3762 #else
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	3763 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	3764 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	3765 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	3766 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	3767 #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	3768 DW_MUTEX_UNLOCK;
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
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 #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	3772 #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	3773 #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	3774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3775 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	3776 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3777 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	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 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	3780 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	3781 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	3782
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3783 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	3784 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	3785 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	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
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 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	3789 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3790 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	3791 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	3792 #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	3793 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	3794 #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	3795 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	3796 #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	3797 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	3798 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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3802 * 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	3803 * Parameters:
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 * 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	3805 * 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	3806 */
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 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	3808 {
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 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	3810 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3811
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3812 DW_MUTEX_LOCK;
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 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	3814 {
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 DW_MUTEX_UNLOCK;
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 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	3817 }
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	3818 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	3819 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	3820 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3821 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	3822 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3823
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3824 /*
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 * 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	3826 * Parameters:
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 * 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	3828 * 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	3829 */
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 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	3831 {
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 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	3833 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	3834 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	3835 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	3836 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	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 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3843 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	3844 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3845 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	3846 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	3847 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	3848 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	3849 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	3850
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3851 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	3852 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	3853 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	3854 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	3855 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	3856 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	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 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	3859 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	3860 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	3861
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 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	3863 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	3864 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	3865
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3866 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	3867 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	3868 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3869 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3870 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3871
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3872
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3873 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3874 * 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	3875 * Parameters:
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 * 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	3877 * 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	3878 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3879 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	3880 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3881 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	3882 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3883
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3884 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3885 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	3886
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3887 /* Left and centered */
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3888 #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	3889 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	3890 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	3891 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3892 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	3893 #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	3894 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	3895 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	3896 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	3897 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	3898 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	3904 * Parameters:
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 * 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	3906 * 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	3907 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3908 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	3909 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3910 GtkWidget 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	3911 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3914 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	3915 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	3916 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	3917 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	3918 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	3919 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	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 /* Left and centered */
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3922 #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	3923 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	3924 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	3925 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	3926 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	3927 #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	3928 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	3929 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	3930 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	3931 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	3932 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3933 return 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	3934 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3935
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3936 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3937 * Create a 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	3938 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3939 * id: An ID to be used 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	3940 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3941 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	3942 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	3943 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	3944 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	3948 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	3949 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	3950 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	3951 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	3952 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	3953 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	3954
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3955 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	3956 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	3957 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	3958 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	3959 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	3960 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	3961 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3962 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3965 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3966 * 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	3967 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3968 * 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	3969 * 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	3970 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3971 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	3972 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3973 GtkWidget *tmp;
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 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	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 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	3980 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	3981
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 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	3983 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	3984
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	3985 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	3986 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	3987 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3988 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	3989 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3990
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3991 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3992 * 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	3993 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3994 * 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	3995 * 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	3996 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3997 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	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 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	4000 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	4004
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4005 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	4006 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	4007 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	4008
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4009 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	4010 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	4011
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4012 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	4013 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	4014 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4015 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	4016 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4018 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4019 * 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	4020 * Parameters:
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 * 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	4022 * 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	4023 */
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 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	4025 {
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 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	4027 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	4028 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	4029
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4030 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4031 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	4032 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	4033 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	4034 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	4035 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	4036 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	4037 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	4038 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	4039 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	4040 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	4041 DW_MUTEX_UNLOCK;
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 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	4043 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4044
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4045 /*
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 * 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	4047 * Parameters:
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 * 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	4049 * 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	4050 */
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 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	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 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	4054 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4056 DW_MUTEX_LOCK;
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 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	4058 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	4059 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	4060 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	4061 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	4062 DW_MUTEX_UNLOCK;
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 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	4064 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4065
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4066 /*
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 * 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	4068 * Parameters:
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 * 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	4070 * 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	4071 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4072 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	4073 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4074 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	4075 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	4076 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4077
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4078 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4079 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	4080 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	4081
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 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	4083 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4084 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	4085 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	4086 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	4087 }
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 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	4089 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	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 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	4092 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4093 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	4094 DW_MUTEX_UNLOCK;
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 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	4096 }
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
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 * 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	4100 * Parameters:
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 * 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	4102 * 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	4103 * 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	4104 * 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	4105 * 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	4106 * (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	4107 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4108 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	4109 {
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	4110 GtkWidget *tmp;
1831 ce7543633fef Slight typo in that last commit fixed. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1830 diff changeset	4111 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	4112 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4113
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4114 DW_MUTEX_LOCK;
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	4115 /* 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	4116 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	4117 /* 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	4118 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	4119 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	4120 {
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_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	4122 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	4123 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	4124 }
1832 cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1831 diff changeset	4125 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	4126 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	4127 {
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	4128 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	4129 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1823 diff changeset	4130 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	4131 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	4132 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	4133 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4134
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 /*
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 * 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	4137 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4138 * 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	4139 * 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	4140 * 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	4141 * (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	4142 * 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	4143 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4144 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	4145 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4146 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	4147 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	4148 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4149
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4150 DW_MUTEX_LOCK;
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 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	4152 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	4153
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4154 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	4155 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4156 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	4157 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	4158 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	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 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	4161 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	4162 {
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 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	4164 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4165 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	4166 DW_MUTEX_UNLOCK;
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 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	4168 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4169
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4170 /*
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 * 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	4172 * Parameters:
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 * 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	4174 * 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	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 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	4177 {
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 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	4179 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	4180 int _locked_by_me = FALSE;
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 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	4183 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	4184 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	4185 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	4186 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	4187 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	4188 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	4189 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	4190 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	4191 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	4192 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	4193 DW_MUTEX_UNLOCK;
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 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	4195 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4197 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4198 * 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	4199 * Parameters:
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 * 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	4201 * 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	4202 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4203 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	4204 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4205 /* 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	4206 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	4207 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4209 DW_MUTEX_LOCK;
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 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	4211 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	4212 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	4213
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	4214 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	4215 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	4216 DW_MUTEX_UNLOCK;
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 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	4218 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4219
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4220 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4221 * 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	4222 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4223 * 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	4224 * 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	4225 * 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	4226 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4227 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	4228 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4229 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	4230 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	4231 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4233 DW_MUTEX_LOCK;
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 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	4235 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	4236 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	4237 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	4238 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	4239 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	4240 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	4241 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	4242 DW_MUTEX_UNLOCK;
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 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	4244 }
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
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4246 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4247 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	4248 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	4249 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4250
775 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 /*
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 * 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	4253 * Parameters:
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 * 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	4255 * 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	4256 * 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	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 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	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 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	4261 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	4262 int _locked_by_me = FALSE;
1793 2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4263 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4264 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4265 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4266
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4267 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4268 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4269 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4270 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4271 #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	4272 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	4273 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	4274 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4275 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1785 diff changeset	4276 #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	4277 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	4278 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	4279 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	4280 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	4281 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	4282 DW_MUTEX_UNLOCK;
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 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	4284 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4285
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 /*
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 * 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	4288 * Parameters:
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 * 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	4290 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4291 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	4292 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4293 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	4294 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	4298 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	4299 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	4300 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4301 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4302 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4303
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4304 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4305 * Create a new 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	4306 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4307 * 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	4308 * 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	4309 */
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 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	4311 {
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 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	4313 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4314
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 DW_MUTEX_LOCK;
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 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	4317 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	4318 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	4319 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	4320 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	4321 DW_MUTEX_UNLOCK;
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 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	4323 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4325 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4326 * 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	4327 * Parameters:
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 * 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	4329 * 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	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 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	4332 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4333 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	4334 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	4335 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	4336 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	4337 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	4338 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4339
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4340 DW_MUTEX_LOCK;
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 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	4342 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4343 DW_MUTEX_UNLOCK;
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 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	4345 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4346 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	4347 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	4348 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	4349 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	4350
775 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 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	4352 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	4353 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	4354 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	4355
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4356 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	4357 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	4358 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	4359
775 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 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	4361 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	4362 {
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 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	4364 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4365 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	4366 {
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 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	4368 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	4369 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	4370 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	4371 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	4372 DW_MUTEX_UNLOCK;
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 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	4374 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4376 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4377 * 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	4378 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4379 * 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	4380 * 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	4381 */
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 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	4383 {
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 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	4385 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	4389
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(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	4391 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	4392 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	4393 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	4394 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	4395 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4396 DW_MUTEX_UNLOCK;
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 }
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 /*
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 * 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	4401 * Parameters:
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 * 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	4403 * 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	4404 * (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	4405 * 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	4406 * 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	4407 * 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	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 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	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 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	4412 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	4413 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	4414 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4415
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4416 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	4417 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	4418
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4419 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4420 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	4421 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	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 {
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	4424 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	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 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	4427 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4428 DW_MUTEX_UNLOCK;
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 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	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
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 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	4433
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 /* 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	4435 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	4436 {
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 /* 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	4438 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	4439 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4440 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	4441 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	4442 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	4443 {
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 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	4445 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	4446 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4447 }
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 ( 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	4449 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4450 DW_MUTEX_UNLOCK;
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 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	4452 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4453 }
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 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	4455 }
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
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 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	4458 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4459 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	4460 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4461 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	4462 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4463 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4464 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	4465 }
775 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 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	4468 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4469 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	4470 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4471 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4473 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4474
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4475 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4476 * 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	4477 * Parameters:
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 * 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	4479 * 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	4480 * (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	4481 * 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	4482 * 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	4483 * 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	4484 * 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	4485 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4486 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	4487 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	4488 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	4489 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4490 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	4491 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	4492
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 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	4494 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	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 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	4497 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	4498 {
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4499 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4500 * 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	4501 * 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	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 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	4504 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	4505 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	4506 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4507 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	4508 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	4509 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4510 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	4511 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4512 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4513 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4514 }
1097 8e9db23a8c31 Fixed icons from data by merging tmp and pixbuf together in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1096 diff changeset	4515 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	4516 /* 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	4517 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	4518 }
1718 fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1709 diff changeset	4519 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	4520 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	4521
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4522 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	4523 {
1823 9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4524 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	4525 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4526 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	4527 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4528 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4529 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	4530 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4531 }
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4532 else
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4533 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1796 diff changeset	4534 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	4535 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4536 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4537 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4538 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4539
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4540 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4541 * 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	4542 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4543 * 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	4544 * 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	4545 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4546 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	4547 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4548 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4549 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	4550
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4551 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4552 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	4553 handle = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4554 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	4555 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	4556 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	4557 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	4558 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	4559 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	4560 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	4561 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4562 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	4563 }
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 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	4565 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	4566 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	4567 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4568 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4569 * 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	4570 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4571 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	4572 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	4573 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	4574 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	4575 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4579
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 /*
1389 0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4581 * 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	4582 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4583 * 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	4584 * 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	4585 */
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4586 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	4587 {
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4588 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	4589
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4590 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	4591 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	4592 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	4593 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	4594 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	4595 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	4596 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4597
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1388 diff changeset	4598 /*
775 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 * 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	4600 * Parameters:
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 * 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	4602 * 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	4603 * 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	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 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	4606 {
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4607 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	4608 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4610 DW_MUTEX_LOCK;
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 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	4612 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	4613 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	4614 possible = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(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	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_UNLOCK;
1742 cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1718 diff changeset	4617 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	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
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 * 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	4622 * Parameters:
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 * 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	4624 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4625 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	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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4629 DW_MUTEX_LOCK;
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 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	4631 DW_MUTEX_UNLOCK;
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
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 * 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	4636 * Parameters:
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 * 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	4638 */
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 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	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 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4644 gtk_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	4645 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4646 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4647
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 /*
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 * 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	4650 * Parameters:
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 * 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	4652 * 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	4653 */
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 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	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 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	4657 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4658
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4659 DW_MUTEX_LOCK;
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 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	4661 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4662 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	4663 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4664 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	4665 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4666 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	4667 {
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	4668 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	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 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	4671 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	4672 DW_MUTEX_UNLOCK;
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 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	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 }
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 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	4677 }
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 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	4679 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	4680 DW_MUTEX_UNLOCK;
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 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	4682 }
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 /*
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 * 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	4686 * Parameters:
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 * 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	4688 * 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	4689 * 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	4690 */
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 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	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 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	4694 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	4698 {
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 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	4700
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4701 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	4702 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4703 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	4704 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	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 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	4707 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	4708 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	4709 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	4710 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	4711 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4712 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4713 DW_MUTEX_UNLOCK;
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 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	4715 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4716
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4717 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4718 * 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	4719 * Parameters:
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 * 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	4721 * 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	4722 * 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	4723 * 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	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 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	4726 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4727 int _locked_by_me = FALSE;
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 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	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 /* 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	4732 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	4733 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	4734 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	4735 {
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 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	4737
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4738 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	4739 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4740 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	4741 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	4742
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4743 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	4744 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	4745 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	4746 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	4747 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	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 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	4750 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	4751 }
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4754 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4756
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 /*
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 * 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	4759 * Parameters:
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 * 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	4761 * 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	4762 * 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	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 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	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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4767
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4768 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	4769 *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	4770 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	4771 *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	4772
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 DW_MUTEX_LOCK;
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 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	4775 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4776 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	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 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	4779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4780 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	4781
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4782 if(bytes)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4783 *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	4784 if(lines)
998 f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!! bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 994 diff changeset	4785 *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	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 }
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 DW_MUTEX_UNLOCK;
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
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 * 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	4793 * Parameters:
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 * 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	4795 * 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	4796 * 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	4797 */
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 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	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 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	4804 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4805 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	4806
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 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	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 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	4810 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	4811
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 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	4813 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	4814 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	4815 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	4816 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4817 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4818 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4821 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4822 * 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	4823 * Parameters:
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 * 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	4825 */
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 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	4827 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4828 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	4829
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4831 if(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	4832 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4833 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	4834
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4835 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	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 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	4838
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 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	4840 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	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 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4844 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4845
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 * 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	4848 * Parameters:
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 * 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	4850 * 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	4851 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4852 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	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 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	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 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	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 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	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 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	4864 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	4865 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	4866
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 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	4868 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	4869 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	4870 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	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 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	4873 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	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 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	4876 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	4877 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	4878 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	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 }
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 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4884 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4885 * 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	4886 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4887 * 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	4888 * 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	4889 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4890 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	4891 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4892 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4893
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 DW_MUTEX_LOCK;
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 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	4896 {
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 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	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 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	4900 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	4901 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4902 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4903 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4905 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4906 * 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	4907 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4908 * handle: Handle to the MLE.
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 * 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	4910 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4911 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	4912 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4913 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4914
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4915 DW_MUTEX_LOCK;
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(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	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 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	4919
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4920 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	4921 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	4922 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4923 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4924 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4925
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4926 /*
1926 3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4927 * 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	4928 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4929 * 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	4930 * 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	4931 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4932 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	4933 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4934 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4935
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1921 diff changeset	4936 /*
775 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 * 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	4938 * Parameters:
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 * 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	4940 * 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	4941 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4942 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	4943 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4944 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
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 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	4948 {
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 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	4950
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4951 if(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	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 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	4954 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	4955 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	4956
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4957 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	4958 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	4959 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	4960 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4961 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	4962 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	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 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	4965 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	4966 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	4967 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	4968 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	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 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4974 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4975 * 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	4976 * Parameters:
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 * 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	4978 * 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	4979 * 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	4980 * 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	4981 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4982 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	4983 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4984 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	4985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4986 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4987 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	4988 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4989 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	4990
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4991 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	4992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4993 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	4994 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	4995
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4996 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	4997 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	4998 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	4999 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	5000 }
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 DW_MUTEX_UNLOCK;
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 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	5004 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5005
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5006 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5007 * 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	5008 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5009 * 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	5010 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5011 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	5012 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5013 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5015 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5016 * 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	5017 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5018 * 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	5019 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5020 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	5021 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5022 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5023
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	5024 /* Internal function to update the progress bar
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	5025 * while in an indeterminate state.
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	5026 */
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	5027 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	5028 {
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	5029 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	5030 {
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	5031 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	5032 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	5033 }
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	5034 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	5035 }
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	5036
775 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 /*
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 * 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	5039 * Parameters:
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 * 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	5041 * 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	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 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	5044 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5045 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5046
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5047 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	5048 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	5049 {
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	5050 /* 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	5051 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	5052 {
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	5053 /* 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	5054 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	5055 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	5056 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	5057 }
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	5058 }
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	5059 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	5060 {
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	5061 /* 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	5062 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	5063 /* 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	5064 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	5065 }
775 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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5067 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5069 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5070 * 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	5071 * Parameters:
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 * 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	5073 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5074 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	5075 {
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 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	5077 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	5078
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5079 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	5080 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	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 DW_MUTEX_LOCK;
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 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	5084 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	5085 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5086 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	5087 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	5088
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5089 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	5090 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	5091 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	5092 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	5093 }
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 DW_MUTEX_UNLOCK;
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 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	5096 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5098 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5099 * 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	5100 * Parameters:
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 * 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	5102 * 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	5103 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5104 void dw_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	5105 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5106 int _locked_by_me = FALSE;
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 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	5108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5109 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	5110 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	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 DW_MUTEX_LOCK;
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 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	5114 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	5115 {
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 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	5117
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	5118 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	5119 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	5120 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	5121 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	5122 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5124 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5125
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5126 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5127 * 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	5128 * Parameters:
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 * 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	5130 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5131 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	5132 {
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 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	5134 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	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 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	5137 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	5138
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 DW_MUTEX_LOCK;
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 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	5141 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	5142 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	5143 DW_MUTEX_UNLOCK;
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 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	5145 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5146
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 * 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	5149 * Parameters:
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 * 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	5151 * 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	5152 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5153 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	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 int _locked_by_me = FALSE;
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 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	5157
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5158 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	5159 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	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 DW_MUTEX_LOCK;
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 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	5163 if(adjustment)
1486 5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5164 {
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1482 diff changeset	5165 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	5166 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	5167 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	5168 }
775 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 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5172 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5173 * Sets the 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	5174 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5175 * handle: Handle to the 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	5176 * 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	5177 * 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	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 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	5180 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5181 int _locked_by_me = FALSE;
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 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	5183
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 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	5185 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	5186
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 DW_MUTEX_LOCK;
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 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	5189 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	5190 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5191 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	5192 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	5193 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	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 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5197
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5198 /*
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 * 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	5200 * Parameters:
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 * 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	5202 * 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	5203 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5204 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	5205 {
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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5207
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5208 DW_MUTEX_LOCK;
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 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	5210 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5212
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5213 /*
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 * 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	5215 * Parameters:
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 * 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	5217 * 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	5218 * 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	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 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	5221 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5222 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	5223 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	5224 int _locked_by_me = FALSE;
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 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	5227 DW_MUTEX_LOCK;
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 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	5229 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	5230 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5231 * 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	5232 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5233 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	5234 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	5235 DW_MUTEX_UNLOCK;
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5238 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5239 * 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	5240 * Parameters:
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 * 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	5242 * 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	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 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	5245 {
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 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	5250 DW_MUTEX_UNLOCK;
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
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 * 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	5255 * Parameters:
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 * 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	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 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	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 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	5261 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5262
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5263 DW_MUTEX_LOCK;
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 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	5265 DW_MUTEX_UNLOCK;
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
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 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	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
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 * 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	5272 * Parameters:
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 * 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	5274 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5275 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	5276 {
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 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	5278 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
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 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	5282 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5283
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5284 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	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
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 * 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	5289 * Parameters:
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 * 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	5291 * 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	5292 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5293 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	5294 {
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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5296
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5297 DW_MUTEX_LOCK;
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 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	5299 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5300 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5301
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 /*
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 * 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	5304 * Parameters:
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 * 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	5306 * 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	5307 * 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	5308 * 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	5309 * 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	5310 * 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	5311 */
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 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	5313 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5314 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	5315 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	5316 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	5317 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	5318 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	5319 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5321 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	5322 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	5323
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 DW_MUTEX_LOCK;
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 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	5326 && 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	5327 (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	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 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	5330
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 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	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 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	5334 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	5335 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	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 DW_MUTEX_UNLOCK;
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 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	5340 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5341
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5342 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5343 * 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	5344 * Parameters:
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 * 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	5346 * 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	5347 * 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	5348 * 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	5349 * 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	5350 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5351 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	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 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	5354 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	5355 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	5356 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	5357 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	5358 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5359
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5360 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5361 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5362
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5363 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5364 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	5365 && 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	5366 (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	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 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	5369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5370 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	5371
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5372 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	5373 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	5374 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	5375 }
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 DW_MUTEX_UNLOCK;
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
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 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	5379 }
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 /*
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 * 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	5383 * Parameters:
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 * 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	5385 * 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	5386 * 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	5387 * 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	5388 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5389 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	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 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	5392 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	5393 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	5394 int _locked_by_me = FALSE;
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
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 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	5397 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	5398
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5399 DW_MUTEX_LOCK;
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 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	5401 && 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	5402 (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	5403 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5404 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	5405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5406 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	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_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5409 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5410
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5411 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5412 * 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	5413 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5414 * 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	5415 * 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	5416 * 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	5417 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5418 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	5419 {
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 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	5421 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	5422 int _locked_by_me = FALSE;
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 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	5425 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	5426
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5427 DW_MUTEX_LOCK;
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 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	5429 && 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	5430 (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	5431 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	5432 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5434
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5435 /*
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 * 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	5437 * Parameters:
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 * 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	5439 * 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	5440 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5441 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	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 int _locked_by_me = FALSE;
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 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	5445 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	5446 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	5447
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5448 if(!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	5449 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	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_LOCK;
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 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	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 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	5455 (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	5456 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	5457 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5458 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5459 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5460 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5461 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	5462 }
775 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 DW_MUTEX_UNLOCK;
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 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	5465 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5466
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 * 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	5469 * Parameters:
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 * 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	5471 * 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	5472 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5473 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	5474 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5475 int _locked_by_me = FALSE;
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 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	5477 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	5478 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	5479
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5480 if(!handle \|\| !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	5481 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	5482
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5483 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5484 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5485
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 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	5487 (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	5488 {
1900 969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5489 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5490
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5491 if(gtk_tree_model_iter_parent(store, &iter, (GtkTreeIter *)item))
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1894 diff changeset	5492 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	5493 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5494 DW_MUTEX_UNLOCK;
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 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	5496 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5497
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5498 /*
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 * 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	5500 * Parameters:
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 * 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	5502 * 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	5503 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5504 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	5505 {
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 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	5507 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	5508 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	5509 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5510
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5511 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	5512 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	5513
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 DW_MUTEX_LOCK;
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 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	5516 && 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	5517 (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	5518 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	5519 DW_MUTEX_UNLOCK;
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 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	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
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 /*
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 * 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	5525 * Parameters:
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 * 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	5527 * 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	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 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	5530 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5531 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	5532 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	5533 int _locked_by_me = FALSE;
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 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	5536 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	5537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5538 DW_MUTEX_LOCK;
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((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	5540 && 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	5541 (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	5542 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5543 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	5544 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	5545
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5546 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	5547 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	5548 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	5549 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5550 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5551 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5552
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 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	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 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	5556 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5557
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 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	5559 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	5560 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	5561 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	5562
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5563 if(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	5564 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5565 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	5566 _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	5567 } 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	5568 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5569 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5570
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5571 /*
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 * 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	5573 * Parameters:
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 * 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	5575 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5576 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	5577 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5578 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	5579 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	5580 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5582 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	5583 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	5584
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 DW_MUTEX_LOCK;
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 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	5587 && 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	5588 (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	5589 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5590 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	5591
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 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	5593 {
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 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	5595 _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	5596 } 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	5597 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5598 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	5599 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5601 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5602
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5603 /*
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 * 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	5605 * Parameters:
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 * 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	5607 * 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	5608 */
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 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	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 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	5612 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	5613 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5614
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5615 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5616 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5617
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5618 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5619 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	5620 && 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	5621 (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	5622 {
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 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	5624 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	5625 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	5626 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5627 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	5632 * Parameters:
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 * 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	5634 * 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	5635 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5636 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	5637 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5638 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	5639 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	5640 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5641
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5642 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	5643 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	5644
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5645 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5646 if((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	5647 && 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	5648 (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	5649 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5650 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	5651 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	5652 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	5653 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5654 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5655 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5656
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5657 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5658 * 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	5659 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5660 * 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	5661 * 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	5662 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5663 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	5664 {
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 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	5666 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	5667 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5669 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	5670 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	5671
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5672 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5673 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	5674 && 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	5675 (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	5676 {
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 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	5678 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5681 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5682
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5683 #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	5684
775 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 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	5686 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5687 int z;
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	5688 char numbuf[21];
775 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 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	5690 GtkListStore *store;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	5691 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	5692 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	5693 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	5694 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	5695 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	5696
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	5697 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	5698 /* 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	5699 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	5700 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	5701
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5702 /* 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	5703 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	5704 /* 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	5705 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	5706 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	5707 /* 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	5708 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	5709 {
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	5710 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	5711 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5712 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	5713 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	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 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5717 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	5718 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5719 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	5720 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5721 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	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 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	5724 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5725 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	5726 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5727 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	5728 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5729 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	5730 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5731 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	5732 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	5733 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	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 }
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 /* 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	5737 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	5738 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	5739 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	5740 /* 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	5741 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	5742 {
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	5743 snprintf(numbuf, 20, "_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	5744 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	5745 col = gtk_tree_view_column_new();
884 0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5746 rend = NULL;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5747 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	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 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	5750 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5751 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	5752 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	5753 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	5754 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	5755 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	5756 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	5757 }
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	5758 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	5759 {
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	5760 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	5761 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	5762 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	5763 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5764 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	5765 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5766 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	5767 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	5768 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	5769 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	5770 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5771 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	5772 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5773 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	5774 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	5775 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	5776 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	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 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	5779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5780 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	5781 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	5782 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	5783 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	5784 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5785 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	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 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	5788 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	5789 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	5790 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	5791 }
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	5792 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	5793 params[2] = tree;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	5794 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	5795 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	5796 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5797 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5798 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	5799 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5800 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	5801 }
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5802 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5803 {
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5804 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	5805 if(rend)
0f99520041c4 Implemented container column alignment on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 883 diff changeset	5806 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	5807 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5808 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	5809 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5810 /* 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	5811 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	5812 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	5813 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	5814 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	5815 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	5816 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5817 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	5818 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5819 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	5820 {
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 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	5822 }
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	5823 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	5824 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	5825 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	5826 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	5827 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	5828 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	5829 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5830
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5831 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5832 * 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	5833 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5834 * 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	5835 * 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	5836 * 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	5837 * 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	5838 * 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	5839 * (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	5840 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5841 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	5842 {
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 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	5844 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5845
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 /*
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5847 * 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	5848 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5849 * 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	5850 * 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	5851 */
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5852 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	5853 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5854 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	5855
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5856 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	5857 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5858
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5859 /*
775 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 * 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	5861 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5862 * handle: Handle to the 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	5863 * 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	5864 * 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	5865 * 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	5866 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5867 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	5868 {
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	5869 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	5870 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	5871 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	5872
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5873 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	5874 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	5875
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	5876 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	5877 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	5878
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	5879 _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	5880
1744 535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5881 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5882 {
1745 7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1744 diff changeset	5883 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	5884 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1742 diff changeset	5885 }
775 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 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	5887 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	5888 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	5889 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5890
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5891 /*
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 * 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	5893 * Parameters:
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 * 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	5895 * 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	5896 * 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	5897 * 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	5898 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5899 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	5900 {
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	5901 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	5902 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5903
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	5904 /* 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	5905 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	5906 {
1709 de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5907 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5908 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5909 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	5910 int pheight = gdk_pixbuf_get_height(ret);
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5911
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5912 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	5913 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1706 diff changeset	5914 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	5915 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	5916 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	5917 }
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	5918 }
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 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	5920 }
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	5921
775 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 * 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	5924 * Parameters:
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 * 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	5926 * 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	5927 * (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	5928 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5929 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	5930 {
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 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	5932 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	5933 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	5934 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	5935
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 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	5937 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	5938
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 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	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 /* 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	5942 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	5943 {
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 /* 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	5945 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	5946 {
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 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	5948 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	5949 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	5950 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5951 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	5952 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	5953 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5954 }
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 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	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 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	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 }
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
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 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	5962 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	5963 DW_MUTEX_UNLOCK;
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 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	5965 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5966
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5967 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5968 * 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	5969 * Parameters:
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 * 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	5971 * 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	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 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	5974 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5975 int _locked_by_me = FALSE;
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 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	5977 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	5978 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	5979
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5980 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5981 * 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	5982 * 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	5983 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5984 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	5985 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	5986 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	5987 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5988 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	5989 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	5990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5991 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	5992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5993 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	5994 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5995 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	5996 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	5997 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5998 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	5999 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6001 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6002 * 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	6003 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6004 * 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	6005 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6006 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	6007 {
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	6008 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	6009
976 ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6010 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	6011 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 972 diff changeset	6012 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	6013 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6014 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6015
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6016 /*
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 * 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	6018 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6019 * 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	6020 * 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	6021 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6022 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	6023 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6024 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	6025 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	6026 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	6027 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	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 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	6030 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	6031
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6032 /* 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	6033 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	6034 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	6035
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6036 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	6037 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6038 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6039
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	6040 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	6041
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6042 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	6043 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6044 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	6045 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6046 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	6047 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	6048 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6049 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	6050 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	6051 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6052
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6053 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6054 * 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	6055 * 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	6056 */
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6057 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	6058 {
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	6059 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	6060 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	6061 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	6062 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	6063 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	6064
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6065 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	6066 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	6067
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6068 /* 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	6069 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	6070 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	6071
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6072 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	6073 {
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6074 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6075
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	6076 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	6077 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	6078 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	6079 {
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	6080 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	6081 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6082
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6083 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	6084 {
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	6085 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	6086 {
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	6087 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	6088 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	6089 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	6090 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	6091
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6092 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	6093 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	6094 }
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	6095 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	6096 {
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	6097 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	6098 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	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, 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	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 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	6103 {
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	6104 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	6105 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	6106 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6107 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	6108 {
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	6109 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	6110
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6111 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	6112 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6113 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	6114 {
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	6115 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	6116 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6117 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	6118 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	6119
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6120 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	6121 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	6122 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	6123 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	6124
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6125 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	6126 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6127 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	6128 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6129 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	6130 {
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	6131 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	6132 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6133 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	6134 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	6135
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6136 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	6137 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	6138 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	6139 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	6140
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1499 diff changeset	6141 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	6142 }
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6143 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	6144 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6145 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6146 }
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6147 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	6148 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6149
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 /*
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 * 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	6152 * Parameters:
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 * 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	6154 * 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	6155 * 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	6156 * 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	6157 * 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	6158 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6159 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	6160 {
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	6161 _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	6162 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6163
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 /*
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 * 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	6166 * Parameters:
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 * 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	6168 * 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	6169 * 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	6170 * 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	6171 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6172 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	6173 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6174 _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	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 * 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	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 * 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	6182 * 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	6183 * 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	6184 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6185 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	6186 {
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 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	6188 }
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 * 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	6192 * Parameters:
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 * 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	6194 * 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	6195 * 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	6196 * 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	6197 * 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	6198 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6199 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	6200 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6201 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	6202 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6203
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6204 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6205 * 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	6206 * Parameters:
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 * 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	6208 * 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	6209 * 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	6210 * 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	6211 * 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	6212 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6213 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	6214 {
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	6215 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	6216
883 63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 877 diff changeset	6217 _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	6218 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6220 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6221 * 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	6222 * Parameters:
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 * 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	6224 * 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	6225 * 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	6226 * 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	6227 * 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	6228 */
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 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	6230 {
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	6231 _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	6232 }
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
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 /*
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 * 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	6236 * Parameters:
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 * 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	6238 * 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	6239 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6240 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	6241 {
781 df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6242 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	6243 int flag, rc = 0;
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	6244 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	6245 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	6246
df6091308b3f Have the basics of containers working now with the tree view widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 780 diff changeset	6247 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	6248 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	6249 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	6250 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6251 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6252 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	6253 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6254
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	6255 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	6256 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	6257
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6258 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	6259 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	6260 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	6261 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	6262 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	6263 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	6264 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	6265 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	6266 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	6267 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	6268 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	6269 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	6270 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6271 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	6272 }
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
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 /*
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 * 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	6276 * Parameters:
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 * 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	6278 * 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	6279 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6280 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	6281 {
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	6282 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	6283 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6284
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6285 /*
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6286 * 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	6287 * Parameters:
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6288 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6289 * 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	6290 * 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	6291 * 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	6292 * 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	6293 */
1291 b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1289 diff changeset	6294 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	6295 {
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	6296 #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	6297 GtkWidget *cont;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6298 int _locked_by_me = FALSE;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6299 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6300 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	6301
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6302 /* 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	6303 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	6304 {
1211 70dca53cb071 Updated GTK3 with the behavior change just commited for Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1207 diff changeset	6305 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	6306 gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cont), FALSE);
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6307 else
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6308 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	6309 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6310 DW_MUTEX_UNLOCK;
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	6311 #endif
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6312 }
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6313
423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6314 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6315 * 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	6316 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6317 * 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	6318 * 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	6319 * 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	6320 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6321 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	6322 {
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6323 GtkWidget *cont;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6324 int _locked_by_me = FALSE;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6325
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6326 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6327 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1207 423da07c8f05 Basic support for row colors on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1203 diff changeset	6328
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6329 /* 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	6330 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	6331 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6332 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	6333
830 43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6334 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	6335 {
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6336 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	6337 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6338 }
43e6282463fa Implemented dw_container_set_column_width(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 820 diff changeset	6339 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	6340 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6341
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	6342 /* 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	6343 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	6344 {
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 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	6346 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	6347 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	6348
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6349 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	6350 /* 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	6351 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	6352 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	6353
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6354 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6355 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6356 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6357
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6358 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6359 {
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	6360 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	6361 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6362
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6363 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	6364 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6365 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	6366 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6367 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6368 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	6369 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6370
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6371 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6372 * 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	6373 * 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	6374 * 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	6375 * 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	6376 * 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	6377 */
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 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	6379 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6380 _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	6381 }
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	6382
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	6383 /*
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	6384 * 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	6385 * 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	6386 * 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	6387 * 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	6388 * 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	6389 */
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	6390 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	6391 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6392 _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	6393 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6394
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6395 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6396 * 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	6397 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6398 * 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	6399 * 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	6400 * 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	6401 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6402 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	6403 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6404 _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	6405 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6406
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6407 /*
1875 fb137f7f91e4 Initial commit of GTK2 code changes (untested) ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1873 diff changeset	6408 * 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	6409 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6410 * 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	6411 * 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	6412 * 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	6413 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6414 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	6415 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6416 _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	6417 }
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	6418
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	6419 /*
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	6420 * 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	6421 * 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	6422 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6423 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6424 * 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	6425 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6426 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	6427 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6428 /* 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	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 /*
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 * 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	6433 * Parameters:
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 * 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	6435 * 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	6436 */
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 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	6438 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6439 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6440 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	6441 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	6442
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6443 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	6444 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	6445
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6446 /* 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	6447 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	6448 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	6449
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6450 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6451 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6452 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6453 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	6454
1092 0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1087 diff changeset	6455 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	6456
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6457 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	6458 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6459 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	6460 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	6461 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6462
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6463 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	6464 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6465 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6466 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6467
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6468 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	6469 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6470 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	6471 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6472
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6473 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6474 * 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	6475 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6476 * handle: Handle to the 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	6477 * 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	6478 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6479 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	6480 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6481 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6482 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	6483 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	6484
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6485 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	6486 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	6487
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6488 /* 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	6489 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	6490 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	6491
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6492 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6493 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6494 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	6495 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	6496
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6497 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	6498 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6499 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	6500 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6501
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6502 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6503 * 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	6504 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6505 * 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	6506 * 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	6507 * 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	6508 * 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	6509 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6510 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	6511 {
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6512 GtkWidget *cont;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6513 int _locked_by_me = FALSE;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6514
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6515 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6516 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	6517
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6518 /* 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	6519 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	6520 {
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	6521 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	6522
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6523 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6524 {
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	6525 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	6526 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6527 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6528 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	6529 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6530
861 8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6531 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6532 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6533 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6534 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6535 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6536 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6537
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6538 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6539
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6540 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6541 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6542 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6543 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6544 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6545 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6546 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6547 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6548 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6549 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6550 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6551 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6552 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6553 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6554 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6555 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6556 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6557 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6558 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6559 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6560 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6561 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6562 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6563 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6564 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6565 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6566 {
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6567 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6568 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6569 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6570 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6571 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6572 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6573 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6574 }
8f2722696a8e Implemented dw_container_scroll() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 843 diff changeset	6575 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	6576 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6577
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6578 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6579 * 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	6580 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6581 * 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	6582 * 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	6583 * 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	6584 * 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	6585 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6586 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	6587 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6588 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6589 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	6590 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	6591 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	6592 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	6593
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6594 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	6595 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	6596
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6597 /* 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	6598 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	6599 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	6600
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6601 if(store)
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 /* 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	6604 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	6605 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6606 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	6607 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	6608 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6609 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6610 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	6611
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6612 if(path)
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 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	6615
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6616 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6617 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6618 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6619
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6620 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	6621 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6622 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	6623 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	6624 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6625 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6626 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6627 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	6628 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	6629 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6630 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6631 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	6632 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6633 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6634
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6635 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	6636 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6637 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6638 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6639
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6640 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	6641 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6642 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	6643 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6644 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	6645 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6646 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6647 else
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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6650
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6651 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	6652 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6653 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	6654 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	6655 }
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 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6658 /* 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	6659 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	6660 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6661 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6662 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6663 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6664 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6665 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	6666 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	6667 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6669 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6670 * 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	6671 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6672 * 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	6673 * 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	6674 * 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	6675 * 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	6676 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6677 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	6678 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6679 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6680 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	6681 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	6682 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	6683 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	6684
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6685 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	6686 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	6687
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6688 /* 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	6689 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	6690 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	6691
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6692 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6693 {
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	6694 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	6695 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	6696
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6697 /* 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	6698 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	6699 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6700 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	6701 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	6702
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6703 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6704 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6705 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	6706
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6707 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6708 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6709 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	6710
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6711 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6712 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6713 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6714
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6715 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	6716 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6717 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	6718 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	6719 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6720 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6721 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6722 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	6723 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	6724 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6725 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6726 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	6727 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6728 /* 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	6729 * 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	6730 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6731 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6732 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6733 else
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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6736
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6737 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	6738 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6739 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	6740 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	6741 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6742 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6743 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6744 /* 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	6745 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	6746 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6747 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6748 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6749 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6750 }
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6751 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	6752 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	6753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6754
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6755 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	6756 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6757 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	6758 void *thisdata;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6759 int retval = FALSE;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	6760
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6761 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	6762 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6763 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	6764 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6765 /* 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	6766 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	6767 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	6768 {
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6769 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6770 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	6771 }
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6772 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6773 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6774 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6775 }
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	6776 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	6777 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6778
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6779 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	6780 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6781 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6782 GtkListStore *store = NULL;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6783 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	6784
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6785 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6786 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	6787
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6788 /* 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	6789 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	6790 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	6791
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6792 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6793 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6794 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6795
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6796 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	6797 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6798 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	6799
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6800 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6801 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6802 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	6803 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	6804 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6805 }
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 DW_MUTEX_UNLOCK;
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
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6810 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6811 * 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	6812 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6813 * 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	6814 * 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	6815 */
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 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	6817 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6818 _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	6819 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6820
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6821 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6822 * 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	6823 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6824 * 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	6825 * 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	6826 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6827 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	6828 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6829 _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	6830 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6831
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6832 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	6833 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6834 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6835 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	6836 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	6837
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6838 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	6839 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	6840
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6841 /* 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	6842 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	6843 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	6844
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6845 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6846 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6847 GtkTreeIter iter;
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6848 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	6849
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6850 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	6851 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6852 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	6853 rows--;
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6854 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6855
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6856 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	6857 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6858 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	6859 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6861 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6862 * 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	6863 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6864 * 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	6865 * 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	6866 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6867 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	6868 {
1873 15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6869 _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	6870 }
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6871
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6872 /*
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6873 * 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	6874 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6875 * 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	6876 * 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	6877 */
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6878 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	6879 {
15d24b5300ec Third GTK3 round of changes to split string and data bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1861 diff changeset	6880 _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	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
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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6884 * 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	6885 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6886 * 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	6887 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6888 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	6889 {
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6890 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6891 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	6892
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6893 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	6894 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	6895
782 5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 781 diff changeset	6896 /* 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	6897 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	6898 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	6899 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	6900 }
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
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6902 /* 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	6903 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	6904 {
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6905 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6906 long x, y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6907 gboolean retval;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6908
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6909 dw_pointer_query_pos(&x, &y);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6910
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6911 event.button = button;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6912 event.x = x;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6913 event.y = y;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6914
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6915 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	6916 }
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6917
775 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 /*
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 * 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	6920 * Parameters:
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 * 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	6922 * 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	6923 * 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	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 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	6926 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6927 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6928 GdkPixbuf *pixbuf;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6929 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6930
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6931 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6932 pixbuf = _find_pixbuf(icon, NULL, NULL);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6933 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6934 if(bubbletext)
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6935 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6936 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	6937 g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_status_translate), handle);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6938 gtk_status_icon_set_visible(status, TRUE);
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6939 DW_MUTEX_UNLOCK;
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6940 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6941
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6942 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6943 * Deletes 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	6944 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6945 * handle: 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	6946 * 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	6947 */
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 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	6949 {
1223 1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6950 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6951 int _locked_by_me = FALSE;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6952
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6953 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6954 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	6955 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1211 diff changeset	6956 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	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 /*
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 * 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	6961 * Parameters:
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 * 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	6963 * 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	6964 * 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	6965 */
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 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	6967 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6968 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6969 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	6970
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 DW_MUTEX_LOCK;
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 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	6973 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	6974 \| 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	6975 \| 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	6976 \| 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	6977 \| 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	6978 \| 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	6979 \| 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	6980 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	6981 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	6982 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	6983 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	6984 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	6985 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6986 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	6987 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6988
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6989 /* 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	6990 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	6991 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6992 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	6993 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	6994 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	6995 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	6996 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6997 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	6998 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	6999 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	7000 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7001
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 /* 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	7003 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7004 * 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	7005 * 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	7006 * 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	7007 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7008 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	7009 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7010 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	7011 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	7012
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7013 *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	7014 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7015
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7016 /* 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	7017 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7018 * 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	7019 * 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	7020 * 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	7021 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7022 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	7023 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7024 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	7025
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7026 if(value == DW_CLR_DEFAULT)
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7027 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7028 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7029 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7030 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	7031 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7032 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7033 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7034 else
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7035 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7036 GdkRGBA color = _internal_color(value);
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7037
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7038 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 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 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	7041 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	7042 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7043 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	7044 }
775 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 }
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
1597 ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7047 #if GTK_CHECK_VERSION(3,3,11)
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7048 /* 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	7049 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7050 * 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	7051 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7052 * 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	7053 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7054 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	7055 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7056 GtkColorChooser *cd;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7057 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	7058 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	7059 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	7060
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7061 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	7062 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	7063 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	7064 gtk_color_chooser_set_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	7065
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7066 gtk_widget_show(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	7067
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7068 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	7069 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7070 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	7071 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	7072 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7073 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	7074 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	7075 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7076 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7077 #else
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7078 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	7079
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7080 /* 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	7081 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	7082 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7083 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	7084 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	7085 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	7086
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7087 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	7088 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	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 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	7091 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	7092 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	7093 _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	7094 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	7095 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	7096 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	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
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 /* 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	7100 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	7101 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7102 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	7103 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	7104
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7105 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	7106 _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	7107 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	7108 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	7109 }
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 /* 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	7112 * Parameters:
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 * 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	7114 * 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	7115 * 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	7116 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7117 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	7118 {
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	7119 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	7120 int _locked_by_me = FALSE;
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 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	7122 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	7123 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	7124 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	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 DW_MUTEX_LOCK;
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 /* 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	7129 * 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	7130 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7131 if(_dw_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	7132 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7133 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7134 return 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	7135 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7136
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7137 _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	7138
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7139 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	7140
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7141 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	7142
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7143 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	7144 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	7145 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	7146 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	7147
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7148 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	7149 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	7150 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	7151
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7152 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	7153
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7154 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	7155 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	7156 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	7157 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7158 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	7159 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1583 diff changeset	7160 #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	7161
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 /* 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	7163 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7164 * 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	7165 * 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	7166 * 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	7167 * 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	7168 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7169 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	7170 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7171 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7172 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7173 #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	7174 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	7175 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7176 #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	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 DW_MUTEX_LOCK;
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 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7180 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7181 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	7182 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7183 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7184 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7185 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7186 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7187 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7188 #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	7189 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	7190 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	7191 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7192 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7193 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7194 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7195 }
775 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 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	7197 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	7198 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	7199 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7200 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	7201
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7202 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	7203 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	7204 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	7205 cairo_stroke(cr);
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 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	7208 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7209 /* 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	7210 * 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	7211 */
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	7212 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	7213 gdk_window_end_draw_frame(gtk_widget_get_window(handle), 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	7214 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7215 #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	7216 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	7217 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7218 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7219 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7220
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 /* 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	7222 * Parameters:
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 * 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	7224 * 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	7225 * 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	7226 * 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	7227 * 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	7228 * 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	7229 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7230 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	7231 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7232 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7233 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7234 #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	7235 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	7236 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7237 #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	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 DW_MUTEX_LOCK;
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 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7241 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7242 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	7243 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7244 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7245 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7246 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7247 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7248 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7249 #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	7250 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	7251 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	7252 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7253 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7254 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7255 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7256 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7257 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	7258 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	7259 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	7260 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7261 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	7262
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7263 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	7264 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	7265 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	7266 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	7267 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7268 #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	7269 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	7270 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7271 /* 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	7272 * 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	7273 */
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	7274 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	7275 gdk_window_end_draw_frame(gtk_widget_get_window(handle), 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	7276 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7277 #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	7278 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	7279 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7280 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7281 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7282
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7283 /* 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	7284 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7285 * 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	7286 * 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	7287 * 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	7288 * 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	7289 * 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	7290 * 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	7291 */
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	7292 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	7293 {
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 int _locked_by_me = FALSE;
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_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	7296 int z;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7297 #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	7298 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	7299 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7300 #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	7301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7302 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7303 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7304 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7305 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	7306 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7307 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7308 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7309 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7310 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7311 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7312 #if GTK_CHECK_VERSION(3,22,0)
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	7313 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	7314 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	7315 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7316 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7317 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7318 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7319 }
775 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 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	7321 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	7322 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	7323 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7324 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7325
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7326 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	7327 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7328
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7329 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	7330 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	7331 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	7332 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	7333 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7334 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	7335 }
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	7336 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	7337 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	7338 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7339 #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	7340 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	7341 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7342 /* 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	7343 * 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	7344 */
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	7345 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	7346 gdk_window_end_draw_frame(gtk_widget_get_window(handle), 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	7347 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7348 #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	7349 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	7350 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7352 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7353
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7354 /* 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	7355 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7356 * 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	7357 * 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	7358 * 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	7359 * 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	7360 * 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	7361 * 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	7362 * 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	7363 */
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	7364 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	7365 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7366 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7367 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7368 #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	7369 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	7370 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7371 #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	7372
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7373 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7374 if(handle)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7375 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7376 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	7377 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7378 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7379 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7380 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7381 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7382 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7383 #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	7384 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	7385 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	7386 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7387 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7388 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7389 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7390 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7391 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	7392 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	7393 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	7394 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7395 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	7396
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7397 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	7398 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7399
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7400 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	7401 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	7402 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	7403 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	7404 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	7405 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	7406 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	7407 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	7408 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7409 #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	7410 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	7411 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7412 /* 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	7413 * 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	7414 */
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	7415 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	7416 gdk_window_end_draw_frame(gtk_widget_get_window(handle), 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	7417 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7418 #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	7419 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	7420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7421 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7422 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7423
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7424 /* 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	7425 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7426 * 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	7427 * 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	7428 * 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	7429 * 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	7430 * 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	7431 * 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	7432 * 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	7433 * 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	7434 * 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	7435 * 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	7436 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7437 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	7438 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7439 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	7440 cairo_t *cr = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7441 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7442 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	7443 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7444 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7445
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7446 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	7447 if(handle)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7448 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7449 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	7450 /* 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	7451 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	7452 {
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7453 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	7454 return;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7455 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7456 #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	7457 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	7458 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	7459 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7460 #else
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7461 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7462 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7463 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7464 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	7465 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	7466 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7467 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7468 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	7469 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	7470 float scale = fabs((float)(y2-y1))/(float)width;
1524 010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7471
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7472 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	7473 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1510 diff changeset	7474
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7475 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	7476 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	7477 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1281 diff changeset	7478 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	7479 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	7480 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	7481 else
1634 c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7482 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1597 diff changeset	7483 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	7484 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	7485 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	7486 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	7487 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	7488
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	7489 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	7490 }
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	7491 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	7492 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	7493 cairo_stroke(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7494 #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	7495 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	7496 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7497 /* 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	7498 * 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	7499 */
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	7500 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	7501 gdk_window_end_draw_frame(gtk_widget_get_window(handle), 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	7502 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7503 #endif
1261 61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7504 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	7505 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7506 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	7507 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1258 diff changeset	7508
775 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 /* 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	7510 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7511 * 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	7512 * 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	7513 * 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	7514 * 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	7515 * 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	7516 */
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 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	7518 {
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 int _locked_by_me = FALSE;
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 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	7521 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	7522 char tmpname, fontname = "monospace 10";
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7523 #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	7524 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	7525 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7526 #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	7527
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 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	7529 return;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	7530
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7531 DW_MUTEX_LOCK;
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 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	7533 {
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7534 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	7535 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7536 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7537 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7538 DW_MUTEX_UNLOCK;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7539 return;
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7540 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7541 #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	7542 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	7543 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	7544 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7545 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7546 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7547 #endif
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7548 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	7549 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	7550 }
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 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	7552 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7553 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7554 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7555 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	7556 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	7557 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	7558 }
775 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 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	7560 {
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7561 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	7562 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	7563 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7564 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	7565
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7566 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	7567 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7568 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	7569
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 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	7571 {
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7572 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	7573 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	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 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	7576 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	7577
1554 e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1545 diff changeset	7578 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	7579 /* 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	7580 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	7581 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7582 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	7583 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	7584 (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	7585 (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	7586 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	7587 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7588 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	7589 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7590 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	7591 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	7592 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 885 diff changeset	7593 /* 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	7594 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	7595 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	7596
775 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 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	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 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	7600 }
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 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	7602 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7603 #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	7604 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	7605 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7606 /* 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	7607 * 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	7608 */
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	7609 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	7610 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1929 diff changeset	7611 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7612 #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	7613 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	7614 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7616 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7617
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 /* 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	7619 * Parameters:
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 * 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	7621 * 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	7622 * 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	7623 * 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	7624 * 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	7625 */
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 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	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 int _locked_by_me = FALSE;
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 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	7630 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	7631 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	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 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	7634 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	7635
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 DW_MUTEX_LOCK;
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 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	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 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	7640 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	7641 {
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 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	7643 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	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 }
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 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	7647 {
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	7648 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	7649 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	7650 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	7651 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	7652 }
775 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
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 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	7655 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	7656 {
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 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	7658
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 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	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 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	7662
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 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	7664 {
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 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	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 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	7668 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	7669 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	7670
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 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	7672 *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	7673 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	7674 *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	7675
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7676 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	7677 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7678 g_object_unref(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	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 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	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 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	7683 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	7684 DW_MUTEX_UNLOCK;
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 }
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
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 /*
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 * 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	7689 * Parameters:
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 * 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	7691 * 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	7692 * 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	7693 * 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	7694 * 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	7695 * 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	7696 * 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	7697 * 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	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 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	7700 {
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 int _locked_by_me = FALSE;
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 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	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 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	7705 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	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 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	7708 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	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 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	7711
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7712
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7713 DW_MUTEX_LOCK;
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 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	7715 /* 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	7716 * 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	7717 */
815 c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 814 diff changeset	7718 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	7719 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	7720 DW_MUTEX_UNLOCK;
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 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	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 * 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	7726 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7727 * 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	7728 * 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	7729 * 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	7730 * (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	7731 * 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	7732 * 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	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 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	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 int _locked_by_me = FALSE;
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 HPIXMAP pixmap;
1258 3df86772b625 Updated the list of supported image formats for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1245 diff changeset	7738 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	7739 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	7740 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	7741
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7742 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	7743 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	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 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	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 /* 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	7748 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	7749 {
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 /* 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	7751 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	7752 {
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 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	7754 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	7755 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	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 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	7758 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	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 }
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 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	7762 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7763 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	7764 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	7765 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7766 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7767
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7768 DW_MUTEX_LOCK;
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 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	7770 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	7771 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	7772 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	7773 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	7774 DW_MUTEX_UNLOCK;
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 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	7776 }
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
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 /*
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 * 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	7780 * Parameters:
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 * 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	7782 * 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	7783 * 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	7784 * (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	7785 * 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	7786 * 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	7787 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7788 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	7789 {
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 int _locked_by_me = FALSE;
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 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	7792 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	7793 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	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 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	7796 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	7797
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 DW_MUTEX_LOCK;
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 /*
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 * 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	7801 * 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	7802 */
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 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	7804 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	7805 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	7806 {
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 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	7808 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	7809 }
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 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	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 DW_MUTEX_UNLOCK;
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 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	7814 }
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 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	7816 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	7817 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	7818 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	7819 /* 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	7820 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	7821 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	7822 DW_MUTEX_UNLOCK;
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 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	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 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7827 * 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	7828 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7829 * 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	7830 * 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	7831 * 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	7832 * 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	7833 * 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	7834 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7835 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	7836 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7837 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7839 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7840 * 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	7841 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7842 * 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	7843 * 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	7844 * 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	7845 * 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	7846 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7847 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	7848 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7849 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	7850 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7851
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 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	7853 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	7854
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
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 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	7857 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	7858 DW_MUTEX_UNLOCK;
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 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	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
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 /* 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	7863 * 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	7864 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7865 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	7866 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7867 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7868
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 /*
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7870 * 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	7871 * 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	7872 * 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	7873 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7874 * 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	7875 * 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	7876 * 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	7877 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7878 * 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	7879 */
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7880 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	7881 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7882 if(pixmap && fontname && *fontname)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7883 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7884 char *oldfont = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7885 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	7886 _convert_font(pixmap->font);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7887 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7888 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7889 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7890 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7891 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7892 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7893
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7894 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7895 * 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	7896 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7897 * pixmap: 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	7898 * 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	7899 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7900 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	7901 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7902 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7903
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7904 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7905 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	7906 cairo_surface_destroy(pixmap->image);
1148 439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7907 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1145 diff changeset	7908 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	7909 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	7910 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7911 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7912
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7913 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7914 * 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	7915 * Parameters:
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 * 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	7917 * 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	7918 * 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	7919 * 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	7920 * 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	7921 * 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	7922 * 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	7923 * 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	7924 * 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	7925 * 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	7926 */
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7927 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	7928 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7929 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	7930 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7931
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7932 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7933 * 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	7934 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7935 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7936 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7937 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7938 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7939 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7940 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7941 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7942 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7943 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7944 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7945 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7946 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7947 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7948 * 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	7949 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7950 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	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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7953 cairo_t *cr = NULL;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7954 int retval = DW_ERROR_GENERAL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7955 #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	7956 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	7957 cairo_region_t *clip = NULL;
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7958 #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	7959
1177 c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1161 diff changeset	7960 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	7961 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	7962
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7963 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7964 if(dest)
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7965 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7966 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	7967 /* Safety check for non-existant windows */
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7968 if(!window \|\| !GDK_IS_WINDOW(window))
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7969 {
c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7970 DW_MUTEX_UNLOCK;
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7971 return retval;
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7972 }
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7973 #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	7974 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	7975 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	7976 cr = gdk_drawing_context_get_cairo_context(dc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7977 #else
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7978 cr = gdk_cairo_create(window);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	7979 #endif
818 c17634e2b303 More safety checks in the drawing functions. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 817 diff changeset	7980 }
775 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 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	7982 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	7983
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7984 if(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	7985 {
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7986 double xscale = 1, yscale = 1;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7987
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7988 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7989 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7990 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7991 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7992 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7993 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7994
775 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 if(src)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7996 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	7997 else if(srcp)
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7998 cairo_set_source_surface (cr, srcp->image, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	7999
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8000 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	8001 cairo_fill(cr);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8002 #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	8003 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	8004 cairo_region_destroy(clip);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8005 /* 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	8006 * 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	8007 */
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	8008 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	8009 gdk_window_end_draw_frame(gtk_widget_get_window(dest), 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	8010 else
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	8011 #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	8012 cairo_destroy(cr);
1245 3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8013 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8014 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8015 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1240 diff changeset	8016 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	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
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 /*
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 * 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	8021 * Parameters:
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 * 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	8023 * 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	8024 */
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 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	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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8028
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8029 DW_MUTEX_LOCK;
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 gdk_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	8031 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8032 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8034 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	8035 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8036 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	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 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	8039 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8040 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	8041 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	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
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 /* 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	8046 * Parameters:
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: 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	8048 * 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	8049 * 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	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_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	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 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	8054 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	8055 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	8056
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8057
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8058 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	8059 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	8060
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8061 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	8062 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	8063
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8064 /* 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	8065 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	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 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	8068 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	8069
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 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	8071 _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	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 *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	8074 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	8075 {
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 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	8077 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	8078 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	8079 *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	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
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 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	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 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	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
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 /* 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	8088 * Parameters:
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 * 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	8090 * 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	8091 * 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	8092 * 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	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 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	8095 {
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 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	8097 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	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 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	8100 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	8101
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 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	8103 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	8104 }
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 /* 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	8107 * Parameters:
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 * 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	8109 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8110 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	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 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	8113 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	8114 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	8115 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8116
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8117 /*
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 * 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	8119 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8120 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	8121 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8122 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	8123
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8124 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	8125 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	8126 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8127
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8128 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8129 * 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	8130 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8131 * 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	8132 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8133 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	8134 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8135 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	8136 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8137 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	8138 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	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 }
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 * 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	8144 * Parameters:
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 * 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	8146 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8147 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	8148 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8149 /* 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	8150 * 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	8151 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8152 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	8153 _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	8154
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8155 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	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 /* 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	8158 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	8159 _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	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
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 /*
1158 f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8163 * 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	8164 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8165 * 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	8166 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8167 * 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	8168 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8169 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	8170 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8171 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	8172 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	8173 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	8174 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8175
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1156 diff changeset	8176 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8177 * 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	8178 * Parameters:
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 * 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	8180 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8181 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	8182 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8183 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	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 * 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	8188 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8189 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	8190 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8191 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	8192
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 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	8194 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	8195
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8196 /* 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	8197 * 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	8198 * 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	8199 */
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_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	8201 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	8202 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	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 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	8205 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	8206 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	8207
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8208 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	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
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 * 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	8213 * Parameters:
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 * 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	8215 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8216 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	8217 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8218 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	8219 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	8220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8221 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	8222 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	8223 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	8224 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	8225 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	8226 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	8227 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8228
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8229 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8230 * 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	8231 * 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	8232 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8233 * 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	8234 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8235 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	8236 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8237 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	8238 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	8239
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8240 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	8241 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	8242 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	8243 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	8244 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	8245 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8246
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8247 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8248 * 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	8249 * 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	8250 * Parameters:
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 * 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	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 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	8254 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8255 int 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	8256
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8257 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	8258 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	8259
1203 fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8260 pthread_mutex_lock (&(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	8261
775 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 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	8263 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8264 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	8265 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	8266 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1191 diff changeset	8267
1156 03b6d9fdfac0 Fixed a typo on Unix... timeout not time. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1155 diff changeset	8268 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	8269 {
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	8270 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	8271 struct timespec 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	8272
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	8273 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	8274 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	8275 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	8276 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	8277 }
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	8278 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	8279 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
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	8280
775 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_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	8282 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	8283 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	8284 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	8285 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	8286 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	8287 }
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 * 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	8291 * Parameters:
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 * 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	8293 */
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 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	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 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	8297 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	8298
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 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	8300 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	8301 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	8302 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	8303 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	8304 *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	8305
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	8306 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	8307 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8308
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8309 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	8310 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	8311 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8314 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	8315 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8316 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	8317 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	8318 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	8319 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	8320 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	8321 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	8322
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 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	8324 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	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 /* 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	8327 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	8328 {
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 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	8330 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	8331 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8332
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 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	8334 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	8335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8336 /* 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	8337 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	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 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	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 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	8342 FD_SET(listenfd, &rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8343 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	8344
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8345 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	8346
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 /* 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	8348 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	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 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	8351 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	8352
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 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	8354 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8355
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8356 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	8357 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1884 diff changeset	8358 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	8359 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	8360 }
775 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 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	8363 {
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 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	8365 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	8366
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8367 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	8368 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8369 /* 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	8370 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	8371 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	8372
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8373 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	8374 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	8375
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8376 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	8377
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8378 /* 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	8379 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	8380 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	8381 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8382 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8383
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 /* 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	8385 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	8386 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8387 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	8388 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8389 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	8390 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8391 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	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 /* 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	8394 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	8395 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	8396 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	8397 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	8398 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8399 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	8400 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	8401 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	8402 }
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 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	8404
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8405 /* 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	8406 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	8407 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	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 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	8410 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8411 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	8412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8413 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	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 /* 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	8416 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	8417 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8418 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	8419 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	8420 /* 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	8421 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8422 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	8423 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	8424
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8425 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	8426
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8427 for(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	8428 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8429 /* 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	8430 * 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	8431 * 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	8432 */
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 if(array[s].waiting)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8434 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	8435 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8436 }
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 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	8438 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	8439 /* 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	8440 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8441 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	8442
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8443 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	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 /* 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	8446 if(posted)
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8447 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	8448 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8449 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	8450 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	8451 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8452 /* 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	8453 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	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 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	8456 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8457 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8458 }
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 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	8460 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8461 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8462
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8463 /* 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	8464 /* 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	8465 * 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	8466 * Parameters:
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 * 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	8468 * 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	8469 * 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	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 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	8472 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8473 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	8474 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	8475 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	8476
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 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	8478 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	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 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	8481 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 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	8483 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	8484 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	8485 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	8486 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	8487
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8488 /* 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	8489 * 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	8490 */
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 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	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 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	8494 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	8495 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	8496 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	8497
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 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	8499 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8500 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	8501 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	8502 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	8503 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	8504 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	8505 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	8506 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	8507 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	8508 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8509
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 /* 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	8511 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	8512 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	8513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8515 /* 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	8516 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8517 * 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	8518 * 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	8519 * 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	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 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	8522 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8523 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	8524 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	8525 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	8526 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	8527
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8528 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	8529 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	8530 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	8531 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	8532 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	8533 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	8534 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8535
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8536 /* 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	8537 * 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	8538 * Parameters:
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 * 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	8540 * 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	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 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	8543 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8544 /* 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	8545 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	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)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8548 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8549
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8550 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	8551 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8552 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	8553 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8554
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 /* 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	8556 * 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	8557 * Parameters:
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 * 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	8559 * 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	8560 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8561 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	8562 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8563
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8564 /* 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	8565 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	8566
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8567 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8568 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8569
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8570 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	8571 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8572 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	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
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 /* 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	8576 * 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	8577 * Parameters:
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 * 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	8579 * 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	8580 * 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	8581 * 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	8582 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8583 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	8584 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8585 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	8586 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	8587 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	8588 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	8589
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8590 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	8591 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	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 /* 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	8594 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	8595 {
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 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	8597 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	8598
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8599 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	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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8602 FD_ZERO(&rd);
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8603 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	8604
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8605 /* 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	8606 tmp = (char)2;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8607 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	8608
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8609 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8610 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	8611
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8612 /* 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	8613 tmp = (char)3;
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8614 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8615 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	8616
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8617 if(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	8618 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	8619 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	8620 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	8621
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8622 /* 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	8623 * 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	8624 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8625 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	8626 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8627 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	8628 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8629
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8630 /* 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	8631 * 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	8632 * Parameters:
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 * 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	8634 * 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	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 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	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 /* 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	8639 * 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	8640 */
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8641 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8642 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	8643 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8644
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8645 /*
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8646 * 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	8647 * 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	8648 * 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	8649 * 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	8650 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8651 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8652 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8653 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8654
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8655 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	8656 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	8657 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	8658 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8659
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8660 /*
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8661 * 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	8662 * 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	8663 * 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	8664 * 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	8665 */
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8666 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8667 {
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8668 GdkRGBA foreground, background;
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8669
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8670 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	8671 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8672 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	8673 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8674 }
09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8675
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8676 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8677 * 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	8678 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8679 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	8680 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8681 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	8682 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	8683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8684 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	8685
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8686 /* Initialize colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8687 _dw_init_thread();
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8688
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8689 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	8690 free(tmp);
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8691
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	8692 /* Free colors */
1887 09860ba329a4 Divided thread initialization and deinitialization into separate bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1886 diff changeset	8693 _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	8694 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8695
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8696 /*
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 * 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	8698 * Parameters:
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 * 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	8700 * 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	8701 * 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	8702 * 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	8703 */
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 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	8705 {
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	8706 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	8707 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	8708
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8709 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	8710 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	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 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	8713 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8714 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	8715 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	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
1106 eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8718 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8719 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8720 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8721 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8722 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1097 diff changeset	8723 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8724
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8725 /* 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	8726 *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	8727
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8728 if(*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	8729 {
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 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	8731 *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	8732 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	8733 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	8734 }
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 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	8737 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	8738 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	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 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	8741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8742
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8743 /*
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 * 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	8745 * Parameters:
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 * 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	8747 * 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	8748 * 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	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 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	8751 {
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	8752 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	8753 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	8754
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 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	8756 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	8757
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8758 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	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 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	8761 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	8762 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8763
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8764 /* 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	8765 *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	8766
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8767 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	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 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	8770 *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	8771 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	8772 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	8773 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8775 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	8776 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	8777 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	8778
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8779 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	8780 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8781
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 * 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	8784 * Parameters:
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 * 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	8786 * 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	8787 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8788 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	8789 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8790 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	8791 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	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 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	8794 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	8795 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8796 /* 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	8797 * 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	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 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	8800 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	8801 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	8802 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8803 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	8804 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8805 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8806 * 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	8807 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8808 * 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	8809 * 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	8810 * 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	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 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	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 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	8815 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	8816 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	8817
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8818 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	8819 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	8820
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8821 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	8822 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	8823 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	8824 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	8825 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8827 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8828 * 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	8829 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8830 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	8831 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8832 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	8833 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8834
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8835 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8836 * 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	8837 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8838 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	8839 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8840 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	8841 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8842
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8843 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8844 * 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	8845 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8846 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	8847 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8848 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8849
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8850 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1853 diff changeset	8851 * 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	8852 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8853 * 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	8854 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8855 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	8856 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8857 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	8858 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8859
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 /* 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	8861 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	8862 {
46e34bd92336 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 GtkWidget *widget = g_object_get_data(G_OBJECT(item), "_dw_user");
46e34bd92336 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 thisheight = thiswidth = 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	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(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	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(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	8870 {
1566 035bc006afbe Experimental change... halfway between min and max for tree controls. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1563 diff changeset	8871 /* 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	8872 *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	8873 *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	8874 }
46e34bd92336 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 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	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 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	8878 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	8879 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	8880 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	8881 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	8882 int hscrolled = FALSE;
46e34bd92336 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 thiswidth = thisheight = 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	8885
46e34bd92336 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 dw_mle_get_size(item, &bytes, NULL);
46e34bd92336 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
46e34bd92336 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 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	8889 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	8890 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	8891 strcat(buf, "\r");
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
46e34bd92336 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 /* 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	8894 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	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 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	8897 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	8898 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	8899 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	8900 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	8901 dw_font_text_extents_get(item, NULL, testtext, 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	8902
46e34bd92336 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 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	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 *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	8906 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	8907 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8908 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	8909 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8910 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	8911 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8912 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	8913 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8914 *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	8915 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	8916 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8917 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	8918 *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	8919 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8920 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8921 *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	8922 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	8923 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	8924 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	8925 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	8926 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8927 if(hscrolled)
1563 90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1562 diff changeset	8928 *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	8929 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8930 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	8931 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8932 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	8933 gtk_widget_get_preferred_width(GTK_WIDGET(widget), NULL, 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	8934
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8935 *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	8936 *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	8937 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8938 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8939 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	8940 *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	8941 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	8942 *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	8943 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	8944 *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	8945 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	8946 *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	8947 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	8948
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	8949 /* 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	8950 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	8951 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8952 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	8953 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	8954
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8955 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	8956 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	8957
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 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8959 * 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	8960 * 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	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 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	8963 {
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 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	8965 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	8966 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	8967
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 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	8969
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8970 /* 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	8971 * 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	8972 */
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	8973 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	8974 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	8975
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8976 /* 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	8977 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	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 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	8980 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	8981 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	8982 }
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	8983 /* 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	8984 * 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	8985 */
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	8986 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	8987 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	8988 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	8989
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	8990 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	8991 {
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 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	8993 int pheight = gdk_pixbuf_get_height(pixbuf);
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	8994
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1414 diff changeset	8995 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	8996 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	8997 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	8998 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	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 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	9001 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	9002 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	9003 }
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 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9005
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9006 /* 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	9007 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	9008
1451 95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1429 diff changeset	9009 /* 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	9010 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	9011 {
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	9012 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	9013 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	9014
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9015 /* 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	9016 * 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	9017 * 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	9018 * 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	9019 */
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9020 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	9021 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9022 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	9023
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9024 /* 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	9025 * 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	9026 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9027 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	9028
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9029 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	9030 {
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	9031 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	9032 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	9033 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	9034 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	9035 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9036 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9037 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	9038 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9039 /* 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	9040 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	9041 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9042
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9043 /* 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	9044 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	9045 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	9046 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	9047 index = boxcount;
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	9048
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9049 #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	9050 /* 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	9051 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	9052 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9053 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	9054
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9055 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	9056 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9057 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	9058 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	9059 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9060 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9061 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	9062 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9063 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	9064
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9065 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	9066 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9067 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	9068 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	9069 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3 bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1637 diff changeset	9070 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9071 #endif
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9072
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9073 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	9074 /* 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	9075 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	9076 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	9077 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	9078 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	9079 /* 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	9080 g_object_set(G_OBJECT(item), "margin", pad, NULL);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9081 /* Add to the grid using insert...
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9082 * 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	9083 */
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	9084 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	9085 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9086 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	9087 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	9088 }
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 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	9090 {
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	9091 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	9092 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	9093 }
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	9094 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	9095 /* 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	9096 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	9097 {
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	9098 gint scrolledwidth = 0, scrolledheight = 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	9099
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9100 /* 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	9101 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	9102 _get_scrolled_size(item, &scrolledwidth, &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	9103
1413 28210f7941c7 Safety checks for -1 parameter to dw_box_pack() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1400 diff changeset	9104 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	9105 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	9106 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	9107 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	9108 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	9109 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	9110 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	9111 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	9112 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9113 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	9114 {
1545 6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1539 diff changeset	9115 /* 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	9116 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	9117 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	9118 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	9119 gtk_widget_set_size_request(item, 50, height);
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9120 else
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1413 diff changeset	9121 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	9122 }
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	9123 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	9124 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9125 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	9126 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	9127
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9128 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	9129 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9130 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	9131 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	9132 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9133 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	9134 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	9135 }
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	9136 /* 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	9137 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	9138 {
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	9139 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	9140 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	9141 }
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	9142 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9143 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	9144
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9145 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	9146 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9147 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	9148 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	9149 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	9150 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	9151 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9152 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9153
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1076 diff changeset	9154 /*
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	9155 * 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	9156 * Parameters:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9157 * 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	9158 * 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	9159 * 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	9160 */
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	9161 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	9162 {
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	9163 int _locked_by_me = FALSE, retcode = DW_ERROR_GENERAL;
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	9164
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	9165 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	9166 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	9167 {
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	9168 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	9169 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	9170
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	9171 /* 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	9172 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	9173 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	9174
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	9175 /* Check if we are removing a widget from a 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	9176 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	9177 {
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	9178 /* 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	9179 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9180 #if GTK_CHECK_VERSION(3,10,0)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9181 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	9182 #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	9183
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	9184 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	9185 {
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 /* 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	9187 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	9188 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	9189 }
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 /* 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	9191 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	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 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	9194 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	9195 }
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 /* Remove the widget from the box */
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9197 #if GTK_CHECK_VERSION(3,10,0)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9198 /* 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	9199 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	9200 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9201 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	9202
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9203 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	9204 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9205 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	9206 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9207 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	9208 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9209 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9210 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9211 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9212 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9213 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9214 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	9215
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9216 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	9217 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9218 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	9219 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9220 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	9221 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9222 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9223 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9224 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9225 #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	9226 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	9227 #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	9228 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	9229 }
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	9230 }
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	9231 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	9232 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	9233 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9234
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9235 /*
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	9236 * 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	9237 * 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	9238 * 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	9239 * 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	9240 * Returns:
1679 e19b93a8229b More comment cleanups. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1678 diff changeset	9241 * 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	9242 */
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	9243 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	9244 {
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9245 int _locked_by_me = FALSE;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9246 HWND retval = 0;
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 DW_MUTEX_LOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9249 /* Check if we are removing a widget from a box */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9250 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9251 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9252 /* 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	9253 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	9254 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
1891 11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9255 #if GTK_CHECK_VERSION(3,10,0)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9256 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	9257 #else
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9258 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9259
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9260 /* 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	9261 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9262 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9263 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9264
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9265 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	9266 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9267 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	9268 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9269 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9270 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	9271 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9272 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9273 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9274 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9275
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9276 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	9277 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9278 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	9279 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9280 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9281 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	9282 }
1890 0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_() bsmith@81767d24-ef19-dc11-ae90-00e081727c95* parents: 1887 diff changeset	9283 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9284
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9285 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9286 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9287 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9288 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9289 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	9290 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9291 /* 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	9292 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	9293 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	9294 else if(item)
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9295 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9296 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	9297 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9298 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	9299 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	9300 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9301 /* Remove the widget from the box */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9302 gtk_container_remove(GTK_CONTAINER(box), 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	9303 #if GTK_CHECK_VERSION(3,10,0)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9304 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	9305 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	9306 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1890 diff changeset	9307 gtk_grid_remove_column(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	9308 #endif
1674 923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9309 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9310 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9311 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9312 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1669 diff changeset	9313 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	9314 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9315
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1656 diff changeset	9316 /*
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9317 * 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	9318 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9319 * 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	9320 * 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	9321 * 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	9322 * 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	9323 * 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	9324 * 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	9325 * 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	9326 * 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	9327 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9328 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	9329 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9330 _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	9331 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9332
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9333 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9334 * 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	9335 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9336 * 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	9337 * 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	9338 * 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	9339 * 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	9340 * 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	9341 * 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	9342 * 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	9343 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9344 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	9345 {
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	9346 /* 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	9347 * 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	9348 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9349 _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	9350 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9351
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9352 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9353 * 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	9354 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9355 * 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	9356 * 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	9357 * 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	9358 * 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	9359 * 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	9360 * 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	9361 * 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	9362 */
1087 173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9363 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	9364 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1081 diff changeset	9365 _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	9366 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9367
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9368
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9369 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	9370 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	9371 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	9372
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9373 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	9374 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9375 /* 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	9376 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	9377 extents_time = 0;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9378 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	9379 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9380
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9381 /* 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	9382 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	9383 {
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	9384 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	9385 {
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 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	9387 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	9388 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	9389 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	9390 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	9391 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	9392
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9393 if(!extents_atom)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9394 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	9395
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 /* 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	9397 *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	9398 *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	9399
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 /* 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	9401 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	9402 {
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 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	9404 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	9405 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	9406 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	9407 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	9408 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9409 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9410 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	9411
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9412 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	9413 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	9414 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	9415 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	9416 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	9417
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9418 /* 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	9419 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	9420 (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	9421 &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	9422
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9423 /* 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	9424 connid = g_signal_connect(G_OBJECT(window), "property_notify_event", G_CALLBACK(_dw_property_notify), gdkwindow);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9425
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	9426 /* 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	9427 time(&extents_time);
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9428
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	9429 /* 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	9430 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9431 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9432 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9433 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9434 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9435 while(currtime - extents_time < 2);
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	9436
1510 218c85939040 Ported fixes in previous commit from GTK2 to GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1506 diff changeset	9437 /* 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	9438 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	9439 }
1479 1d414e81a099 FIXME: Workaround on GTK for Compiz not sending property notify bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1477 diff changeset	9440
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	9441 /* 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	9442 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	9443 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	9444 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	9445 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	9446 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	9447 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	9448 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9449 *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	9450 *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	9451 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9452 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1481 diff changeset	9453 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	9454 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	9455 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9456
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9457 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9458 * 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	9459 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9460 * 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	9461 * 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	9462 * 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	9463 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9464 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	9465 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9466 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9467
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9468 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	9469 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	9470
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9471 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9472 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	9473 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9474 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	9475 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	9476
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9477 /* 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	9478 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	9479 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9480 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9481 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	9482
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9483 /* 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	9484 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	9485 gdk_window_get_geometry(window, NULL, NULL, &gwidth, &gheight);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9486
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9487 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	9488 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	9489 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9490 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	9491 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	9492 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9493 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9494 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9495 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9496 /* 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	9497 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	9498 (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	9499 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9500 /* 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	9501 * 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	9502 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9503 _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	9504 /* 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	9505 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	9506 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	9507 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9508 /* 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	9509 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	9510 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	9511 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9512 /* 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	9513 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	9514 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1470 diff changeset	9515 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	9516 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	9517 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9518 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9519 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	9520 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	9521 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9522 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9523
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9524 /*
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	9525 * 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	9526 * 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	9527 * 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	9528 * 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	9529 * 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	9530 */
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	9531 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	9532 {
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	9533 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	9534
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	9535 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	9536 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	9537 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9538 gint scrolledwidth, 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	9539
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9540 _get_scrolled_size(handle, &scrolledwidth, &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	9541
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9542 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	9543 *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	9544 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	9545 *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	9546 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9547 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	9548 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1556 diff changeset	9549 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	9550 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	9551 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	9552 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	9553 }
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	9554 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	9555 }
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	9556
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9557 /* 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	9558 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9559 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9560 #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	9561 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9562 GdkDisplay *display = gdk_display_get_default();
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9563
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9564 if(display)
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 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9567
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9568 if(monitor)
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 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9571 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9572 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9573 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9574 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9575 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9576 return 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9577 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9578 return gdk_screen_width();
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9579 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9580 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9581
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	9582 /*
775 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 * 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	9584 */
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 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	9586 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9587 int retval = 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9588 int _locked_by_me = FALSE;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9589
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9590 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9591 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	9592 DW_MUTEX_UNLOCK;
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 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	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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9596 /* 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	9597 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9598 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9599 #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	9600 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9601 GdkDisplay *display = gdk_display_get_default();
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9602
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9603 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9604 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9605 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9606
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9607 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9608 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9609 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9610 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9611 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9612 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9613 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9614 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9615 return 0;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9616 #else
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9617 return gdk_screen_height();
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9618 #endif
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9619 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9620
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9621 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9622 * 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	9623 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9624 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	9625 {
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 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	9627 int _locked_by_me = FALSE;
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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9629 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9630 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	9631 DW_MUTEX_UNLOCK;
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 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	9633 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9634
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 /* 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	9636 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	9637 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9638 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	9639 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	9640 int _locked_by_me = FALSE;
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
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9642 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9643 #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	9644 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	9645 #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	9646 vis = gdk_visual_get_system();
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9647 #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	9648 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	9649 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9650 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	9651 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9652
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9653 /*
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9654 * 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	9655 * 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	9656 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9657 * 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	9658 * 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	9659 * 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	9660 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9661 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	9662 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9663 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	9664 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	9665 }
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 /*
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9668 * 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	9669 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9670 * 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	9671 * 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	9672 * 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	9673 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9674 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	9675 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9676 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	9677 #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	9678 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9679 #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	9680
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9681 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9682 return;
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9683
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9684 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	9685 #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	9686 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	9687 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9688 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	9689 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9690 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9691 #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	9692 {
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9693 GdkWindow *window = NULL;
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9694
fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9695 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	9696 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9697 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	9698 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	9699 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	9700 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	9701 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	9702 int newx = x, newy = y, width = 0, height = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9703
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9704 /* 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	9705 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	9706 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9707 /* 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	9708 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	9709 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9710 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	9711 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	9712
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9713 /* 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	9714 gdk_window_get_frame_extents(window, &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	9715
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	9716 /* FIXME: Sometimes we get returned an invalid 200x200
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	9717 * result... so if we get this... try the call a second
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	9718 * 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	9719 */
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	9720 while((frame.width == 200 \|\| frame.width == (200 + cx)) &&
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1472 diff changeset	9721 (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	9722 {
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	9723 _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	9724 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	9725 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	9726 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9727 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	9728 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	9729 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9730 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9731 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9732 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9733 /* 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	9734 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	9735 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9736 /* 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	9737 * 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	9738 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9739 _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	9740 /* 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	9741 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	9742 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	9743 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9744 /* 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	9745 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	9746 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	9747 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	9748 /* 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	9749 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	9750 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	9751 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	9752 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9753 /* 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	9754 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	9755 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9756 /* 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	9757 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9758 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9759 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9760 /* 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	9761 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	9762 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9763 /* 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	9764 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	9765 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	9766 /* 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	9767 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	9768 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	9769 /* 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	9770 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	9771 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	9772 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	9773 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	9774
1575 58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1566 diff changeset	9775 #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	9776 /* 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	9777 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	9778 {
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9779 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9780 #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	9781 GdkDisplay *display = gdk_display_get_default();
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9782
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9783 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9784 {
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9785 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9786
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9787 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9788 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9789 }
25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9790 #else
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9791 GdkScreen *screen = gdk_screen_get_default();
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9792
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9793 gdk_screen_get_monitor_workarea(screen, 0, &rect);
1929 25da63f0eddc Updates for supporting newer versions of GTK3.... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1926 diff changeset	9794 #endif
1499 97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9795 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	9796 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9797 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	9798 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9799 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	9800 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	9801 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9802 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	9803 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9804 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	9805 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9806 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	9807 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	9808 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9809 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1491 diff changeset	9810 #endif
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9811 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9812 /* 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	9813 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	9814 }
1121 fb92778105b2 Fixes some major window positioning problems in GTK3... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1118 diff changeset	9815 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	9816 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	9817 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9818 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9820
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9821 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9822 * 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	9823 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9824 * 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	9825 * 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	9826 * 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	9827 * 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	9828 * 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	9829 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9830 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	9831 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9832 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	9833 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	9834 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9836 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9837 * 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	9838 * Parameters:
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 * 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	9840 * 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	9841 * 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	9842 * 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	9843 * 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	9844 */
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 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	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 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	9848 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	9849 #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	9850 GtkWidget *mdi;
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9851 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9852
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9853 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9854 #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	9855 /* 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	9856 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	9857 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9858 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	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 else
1913 5d32be499016 The GTK MDI code is filling up with deprecated calls bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1912 diff changeset	9861 #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	9862 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9863 GdkWindow *window;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9864
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9865 /* 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	9866 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	9867 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9868 /* 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	9869 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	9870 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9871 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	9872 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9873 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9874
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9875 /* 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	9876 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	9877 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	9878 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	9879 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	9880 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	9881 }
775 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 }
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 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	9884 {
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9885 /* 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	9886 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	9887 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	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 }
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 }
1469 b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9891 /* 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	9892 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9893 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9894 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9895 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9896 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9897 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9898 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1463 diff changeset	9899 *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	9900 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9901 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9902
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9903 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9904 * 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	9905 * Parameters:
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 * 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	9907 * 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	9908 * 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	9909 */
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 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	9911 {
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 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	9913 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9914
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9915 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9916 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	9917 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9918 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	9919 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	9920 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	9921 }
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 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	9923 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9924 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	9925 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	9926 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	9927 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9928 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	9929 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9930 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	9931 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9932 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	9933 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9934 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	9935 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9936 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	9937 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9938 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	9939 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9940 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9941 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9942 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	9943 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9944 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	9945 /* 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	9946 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	9947 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	9948 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	9949 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	9950 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	9951 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	9952 /* 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	9953 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	9954 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	9955 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	9956 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	9957 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	9958 y = DW_BOTTOM;
1917 933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	9959 #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	9960 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	9961 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	9962 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1916 diff changeset	9963 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	9964 #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	9965 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	9966 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	9967 }
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	9968 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	9969 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9970 int check = 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	9971
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9972 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	9973 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	9974
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9975 _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	9976 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	9977 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	9978 _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	9979 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9980 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	9981 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1308 diff changeset	9982 _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	9983 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	9984 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	9985 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	9986 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	9987 _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	9988 }
775 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 DW_MUTEX_UNLOCK;
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
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 /*
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 * 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	9994 * Parameters:
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 * 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	9996 * 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	9997 * 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	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 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	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 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	10002 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10003 GtkWidget **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	10004
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 DW_MUTEX_LOCK;
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 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	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 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	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 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	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 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	10013 {
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	10014 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	10015 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	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 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	10018 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	10019
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	10020 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	10021 /* 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	10022 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	10023 DW_MUTEX_UNLOCK;
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 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10027 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10028 DW_MUTEX_UNLOCK;
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 /* 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	10031 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	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 /* 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	10035 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	10036 {
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 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	10038 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	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 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	10041 {
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 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	10043 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10044 if((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	10045 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10046 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	10047 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	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 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	10052 }
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
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 /*
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 * 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	10056 * Parameters:
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 * 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	10058 * 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	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 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	10061 {
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 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	10063 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	10064
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10065 DW_MUTEX_LOCK;
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 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	10067 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	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 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	10070 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	10071 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	10072 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10073 DW_MUTEX_UNLOCK;
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
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 * 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	10078 * Parameters:
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 * 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	10080 */
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 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	10082 {
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 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	10084 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10087 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	10088 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	10089 DW_MUTEX_UNLOCK;
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 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	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
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 * 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	10095 * Parameters:
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 * 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	10097 * 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	10098 */
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 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	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 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	10102
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 DW_MUTEX_LOCK;
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 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	10105 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	10106 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	10107 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10108 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10109
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10111 /*
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 * 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	10113 * Parameters:
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 * 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	10115 * 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	10116 * 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	10117 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10118 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	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 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	10121 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	10122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10123 DW_MUTEX_LOCK;
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 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	10125 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	10126 {
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	10127 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	10128 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	10129
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	10130 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	10131 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	10132 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	10133 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10134
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 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	10136 {
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 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	10138 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	10139 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	10140 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10141 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10142 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10143
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 /*
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 * 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	10146 * Parameters:
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 * 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	10148 * 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	10149 * 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	10150 */
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 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	10152 {
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 /* 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	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 * 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	10158 * Parameters:
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 * 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	10160 * 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	10161 * 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	10162 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10163 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	10164 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10165 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	10166 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	10167 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	10168 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	10169
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	10170 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	10171 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	10172 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	10173 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	10174 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	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 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	10177 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10178 DW_MUTEX_UNLOCK;
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 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	10180 }
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 /* 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	10183 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	10184 {
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 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	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 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	10188 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	10189 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10190 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	10191 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	10192 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	10193 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	10194 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	10195 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	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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10198 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10199
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10200 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	10201
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10202 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	10203
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10204 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	10205 {
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	10206 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	10207 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	10208 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10210 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	10211 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	10212 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	10213 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	10214 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	10215 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	10216 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10217 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10218
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10219 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10220 * 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	10221 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10222 * 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	10223 * 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	10224 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10225 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	10226 {
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	10227 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	10228 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10229
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10230 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10231 * 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	10232 * 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	10233 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10234 * 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	10235 * 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	10236 * 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	10237 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10238 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	10239 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10240 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	10241 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	10242 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	10243
99ce0ea1f271 Implemented many 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 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	10245 /* 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	10246 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	10247 {
99ce0ea1f271 Implemented many 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 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	10249 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	10250 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	10251 }
99ce0ea1f271 Implemented many 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 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	10253 {
99ce0ea1f271 Implemented many 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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10255
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	10256 /* 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	10257 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	10258 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	10259 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	10260 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	10261
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	10262 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	10263 {
99ce0ea1f271 Implemented many 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 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	10265 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	10266 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10267
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	10268 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	10269 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10270 /* 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	10271 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	10272 }
99ce0ea1f271 Implemented many 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 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	10274 {
99ce0ea1f271 Implemented many 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 /* 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	10276 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	10277 }
99ce0ea1f271 Implemented many 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 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	10279 }
99ce0ea1f271 Implemented many 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 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	10281 }
99ce0ea1f271 Implemented many 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
99ce0ea1f271 Implemented many 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 * 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	10285 * 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	10286 * 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	10287 * 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	10288 * 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	10289 */
99ce0ea1f271 Implemented many 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 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	10291 {
99ce0ea1f271 Implemented many 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 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	10293 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	10294 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	10295
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10296 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	10297 /* 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	10298 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	10299 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10300 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	10301 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	10302 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	10303 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10304 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	10305 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10306 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	10307 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10308
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	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));
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	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
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	10315 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	10316 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10317 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	10318 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	10319 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10320
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	10321 /* 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	10322 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	10323 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10324 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	10325 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	10326 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10327 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10328 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	10329 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10330
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10331 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10332 * 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	10333 * 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	10334 * 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	10335 */
99ce0ea1f271 Implemented many 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 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	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 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	10339 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	10340 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	10341
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10342 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	10343 /* 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	10344 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	10345 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10346 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	10347 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	10348 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	10349 }
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	10350 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	10351 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10352 /* 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	10353 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	10354 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	10355 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	10356 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	10357
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	10358 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	10359 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 775 diff changeset	10360 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	10361 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	10362 }
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	10363 /* Clear the list */
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10364 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	10365 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10366 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10367 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10368
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 * 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	10371 * Parameters:
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 * 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	10373 */
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 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	10375 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10376 GtkWidget *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	10377 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	10378 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	10379 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	10380
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10381 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	10382 /* 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	10383 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	10384 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10385 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	10386 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	10387 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	10388 }
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	10389 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	10390 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10391 /* 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	10392 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	10393 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	10394 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	10395 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	10396
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	10397 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	10398 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10399 /* 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	10400 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	10401 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10402 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10403 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10404 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	10405 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10406
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10407 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10408 * 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	10409 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10410 * 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	10411 * 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	10412 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10413 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	10414 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10415 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	10416 int _locked_by_me = FALSE;
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10419 if(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	10420 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10421 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	10422 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	10423 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	10424 }
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10425 /* 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	10426 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	10427 {
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10428 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	10429 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	10430
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10431 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10432 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10433 /* 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	10434 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	10435 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	10436 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	10437 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	10438 gdouble change;
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10439
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10440 /* Safety check */
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10441 if(rowcount < 2)
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10442 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10443 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10444 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10445 }
1330 c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10446
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10447 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10448 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10449 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1327 diff changeset	10450 top = rowcount;
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10451
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10452 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	10453
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10454 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	10455 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	10456 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10457 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10458 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10459
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10460 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10461 * 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	10462 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10463 * 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	10464 * 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	10465 * 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	10466 * 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	10467 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10468 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	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 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	10471 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	10472 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	10473
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10474 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	10475 /* 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	10476 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	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 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	10479 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	10480 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	10481 }
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	10482 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	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 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10485 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10486 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10487 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10488 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10489
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10490 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	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 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10493
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10494 /* 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	10495 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	10496 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10497 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10498 gchar *text;
1884 71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10499 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	10500 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10501 {
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10502 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	10503 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1881 diff changeset	10504 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10505 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10506 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10507 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10508 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10509 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10510 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	10511 DW_MUTEX_UNLOCK;
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 }
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 * 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	10516 * Parameters:
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 * 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	10518 * 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	10519 * 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	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 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	10522 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10523 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	10524 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	10525 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	10526
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10527 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	10528 /* 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	10529 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	10530 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10531 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	10532 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	10533 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	10534 }
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	10535 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	10536 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10537 /* Make sure it is the correct tree type */
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10538 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10539 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10540 else if(GTK_IS_COMBO_BOX(handle2))
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10541 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10542
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10543 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	10544 {
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	10545 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10546
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10547 /* 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	10548 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	10549 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10550 /* Update the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10551 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	10552 }
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	10553 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10554 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10555 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10556 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10557
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10558 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10559 * 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	10560 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10561 * 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	10562 * 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	10563 */
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 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	10565 {
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	10566 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	10567 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	10568 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	10569 int _locked_by_me = FALSE;
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
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 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	10572 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	10573
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	10574 /* 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	10575 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	10576 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	10577
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	10578 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	10579 {
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	10580 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	10581 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	10582
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	10583 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	10584 {
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	10585 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	10586 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	10587
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	10588 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	10589 {
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	10590 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	10591
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	10592 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	10593 {
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	10594 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	10595 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	10596 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10597
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	10598 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	10599 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	10600 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10601
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	10602 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	10603 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	10604 }
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	10605 }
1124 aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1122 diff changeset	10606 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	10607 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	10608 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10610 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10611 * 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	10612 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10613 * 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	10614 */
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	10615 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	10616 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10617 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	10618 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10619 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	10620 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	10621
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10622 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10623 /* 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	10624 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	10625 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10626 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	10627 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	10628 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	10629 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10630 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10631 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10632 /* 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	10633 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	10634 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	10635 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	10636 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	10637
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10638 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10639 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10640 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	10641 {
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10642 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	10643 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	10644 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	10645 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10646 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	10647 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	10648
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10649 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	10650 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10651 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	10652 }
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10653
780 fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10654 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	10655 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	10656 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10657 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10658 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10659 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 779 diff changeset	10660 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	10661 GtkTreePath *path;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10662
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	10663 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	10664 {
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	10665 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	10666 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	10667 {
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	10668 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	10669
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	10670 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	10671 {
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	10672 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	10673 }
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	10674 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	10675 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10676 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10677 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10678 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10679 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10680 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10681 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	10682 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10684 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10685 * 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	10686 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10687 * 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	10688 * 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	10689 * 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	10690 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10691 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	10692 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10693 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	10694 GtkListStore *store = NULL;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10695 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	10696
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10697 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10698 /* 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	10699 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	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 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	10702 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	10703 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	10704 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10705 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10706 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10707 /* 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	10708 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	10709 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	10710 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	10711 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	10712
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10713 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	10714 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10715 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10716
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10717 /* 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	10718 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	10719 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10720 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	10721 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10722 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	10723 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10724 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10725 {
787 098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10726 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	10727 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10728 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10729 /* 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	10730 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	10731 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10732 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10733 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 786 diff changeset	10734 /* 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	10735 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	10736 }
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10737 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10738 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10739 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10740 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10741 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10743
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10744 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10745 * 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	10746 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10747 * 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	10748 * 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	10749 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10750 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	10751 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10752 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	10753 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	10754 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	10755
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10756 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	10757 /* 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	10758 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	10759 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10760 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	10761 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	10762 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	10763 }
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	10764 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	10765 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10766 /* 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	10767 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	10768 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	10769 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	10770 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	10771
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	10772 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	10773 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10774 GtkTreeIter iter;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	10775
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10776 /* 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	10777 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	10778 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10779 gtk_list_store_remove(store, &iter);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	10780 }
778 99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10781 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 777 diff changeset	10782 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10783 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10784 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10785
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	10786 /* 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	10787 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	10788 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10789 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	10790 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	10791
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10792 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	10793 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10794 GtkAllocation alloc;
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10795
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10796 gtk_widget_get_allocation(widget, &alloc);
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10797
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10798 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	10799 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	10800 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	10801 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	10802 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	10803 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	10804 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10805 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	10806 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1352 diff changeset	10807
775 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 /* 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	10809 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	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 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	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 /* 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	10814 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	10815 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	10816
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	10817 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	10818 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	10819 }
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 /*
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 * 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	10823 * Parameters:
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 * 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	10825 * 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	10826 * 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	10827 * 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	10828 * 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	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 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	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 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	10833 int _locked_by_me = FALSE;
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 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	10835
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 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	10837 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	10838 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	10839 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	10840 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	10841 *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	10842 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	10843 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	10844 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	10845 DW_MUTEX_UNLOCK;
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 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	10847 }
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
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 /*
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 * 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	10851 * Parameters:
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 * 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	10853 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10854 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	10855 {
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 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	10857 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	10858
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	10859 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	10860 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	10861 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	10862 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	10863
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10864 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	10865 *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	10866
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10867 if(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	10868 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10869 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	10870
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_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	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 }
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
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 * 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	10877 * Parameters:
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 * 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	10879 */
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 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	10881 {
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 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	10883
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 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	10885 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	10886 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	10887 }
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
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 * 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	10891 * Parameters:
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 * 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	10893 * 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	10894 * 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	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 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	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 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	10899 int _locked_by_me = FALSE;
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 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	10901 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	10902 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	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 DW_MUTEX_LOCK;
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 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	10906 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	10907 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	10908 /* 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	10909 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	10910 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	10911 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	10912 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	10913 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	10914 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	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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10917 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	10918 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10919
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10920 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10921 * 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	10922 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10923 * 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	10924 * 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	10925 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10926 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	10927 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10928 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10929
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10930 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10931 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	10932 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10933 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	10934 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	10935 }
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 DW_MUTEX_UNLOCK;
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 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	10938 }
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
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10940 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10941 * 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	10942 * Parameters:
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 * 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	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 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	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 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10948
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10949 DW_MUTEX_LOCK;
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 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	10951 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10952 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	10953 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	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 DW_MUTEX_UNLOCK;
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 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	10957 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10958
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10959 /*
1795 9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10960 * 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	10961 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10962 * 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	10963 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10964 * 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	10965 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10966 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	10967 {
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10968 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	10969
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10970 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10971 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10972
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10973 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	10974 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	10975 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	10976 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10977
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10978 /*
775 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 * 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	10980 * Parameters:
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 * 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	10982 * 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	10983 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1793 diff changeset	10984 * 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	10985 */
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 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	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 int _locked_by_me = FALSE;
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 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	10991 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	10992
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 DW_MUTEX_LOCK;
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 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	10995 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10996 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10997
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10998 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10999 * 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	11000 * Parameters:
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 * 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	11002 * 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	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 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	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 int _locked_by_me = FALSE;
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
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 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	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 DW_MUTEX_LOCK;
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 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	11013 DW_MUTEX_UNLOCK;
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 * 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	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 * 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	11020 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11021 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	11022 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11023 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	11024 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	11025 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	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 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	11028 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	11029 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	11030
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11031 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	11032
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 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	11034
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 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	11036 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	11037 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	11038 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	11039 #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	11040 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	11041 #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	11042 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	11043 #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	11044
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 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	11046 {
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 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	11048 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11049 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	11050 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	11051 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	11052 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	11053 }
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 }
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 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	11056 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	11057 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11058
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 * 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	11061 * Parameters:
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 * 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	11063 * 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	11064 * 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	11065 * 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	11066 * 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	11067 * 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	11068 * 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	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 */
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 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	11072 {
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 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	11074
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 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	11076 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	11077 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	11078 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	11079 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	11080 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	11081 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	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 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	11084 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11085 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	11086 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	11087 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	11088 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	11089 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	11090 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	11091 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	11092 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	11093 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	11094 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	11095 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	11096 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	11097 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	11098 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	11099 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	11100 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	11101 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11103 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	11104 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11105 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	11106 _("_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	11107 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	11108 NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11109
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11110 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	11111 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	11112
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11113 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	11114 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11115 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	11116 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	11117 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	11118 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	11119 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	11120 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	11121 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	11122 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	11123 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	11124 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	11125 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11126
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11127 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	11128 {
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11129 struct stat buf;
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11130
877 d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 876 diff changeset	11131 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	11132 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11133 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	11134 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11135
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11136 /* See if the path exists */
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11137 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11138 {
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11139 /* 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	11140 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11141 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	11142 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	11143 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	11144 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11145 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	11146 }
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11147 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11148 {
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	11149 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	11150 {
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	11151 unsigned long x = strlen(mypath) - 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	11152
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	11153 /* 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	11154 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	11155 {
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	11156 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	11157 }
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	11158 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	11159 {
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	11160 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	11161 char temp[PATH_MAX+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	11162
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	11163 /* 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	11164 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	11165 mypath[x] = 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	11166
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	11167 /* 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	11168 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	11169 {
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	11170 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	11171 {
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	11172 /* 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	11173 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	11174 }
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	11175 }
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	11176
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	11177 /* 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	11178 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	11179 /* ... 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	11180 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	11181 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	11182 }
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	11183 }
1295 d0c9d4d0ff3b Implement default filename support for GTK. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1291 diff changeset	11184 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11185 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11186
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11187 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	11188 {
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 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	11190 /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	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
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 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	11194 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	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
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
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 /*
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 * 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	11200 * Parameters:
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 * 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	11202 * 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	11203 * 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	11204 * 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	11205 * -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	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 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	11208 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11209 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	11210
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11211 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	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 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	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 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	11216 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	11217 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	11218 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	11219 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11220 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	11221 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11222 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	11223 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11224 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	11225
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11226 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	11227 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11228 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	11229 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	11230 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11231 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	11232 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11233 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	11234
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11235 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	11236 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11237 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	11238 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11239 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	11240 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	11241 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	11242 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	11243 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	11244 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11245 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	11246 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	11247 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11248 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	11249 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11250 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	11251 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	11252 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11253 /* 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	11254 _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	11255 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11256 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	11257 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11258
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11259 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11260 * 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	11261 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11262 * 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	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 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	11265 {
1118 63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11266 /* 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	11267 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	11268 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11269 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	11270 }
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11271 else
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11272 {
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11273 /* 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	11274 * 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	11275 */
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11276 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	11277
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11278 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	11279 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	11280 execargs[0] = browser;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11281 execargs[1] = url;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11282 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11283
63dd52ba9a8f Added support for attempting to launch a browser using a bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1116 diff changeset	11284 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	11285 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11286 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11288 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11289 * 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	11290 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11291 * 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	11292 * 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	11293 */
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 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	11295 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11296 #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	11297 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11298 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	11299 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	11300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11301 if (!_webkit_web_view_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	11302 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	11303
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11304 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11305 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(handle), "_dw_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	11306 if ( 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	11307 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11308 switch( 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	11309 {
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 case DW_HTML_GOBACK:
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 _webkit_web_view_go_back( 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	11312 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	11313 case DW_HTML_GOFORWARD:
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 _webkit_web_view_go_forward( 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	11315 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	11316 case DW_HTML_GOHOME:
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 _webkit_web_view_open( web_view, "http://dwindows.netlabs.org" );
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 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	11319 case DW_HTML_RELOAD:
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 _webkit_web_view_reload( 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	11321 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	11322 case DW_HTML_STOP:
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 _webkit_web_view_stop_loading( 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	11324 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	11325 case DW_HTML_PRINT:
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 frame = _webkit_web_view_get_focused_frame( 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	11327 _webkit_web_frame_print( 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	11328 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	11329 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11330 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11331 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11332 #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	11333 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11334
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11335 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11336 * 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	11337 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11338 * 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	11339 * 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	11340 * 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	11341 * 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	11342 * 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	11343 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11344 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	11345 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11346 #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	11347 int _locked_by_me = FALSE;
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 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	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 if (!_webkit_web_view_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	11351 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	11352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11353 DW_MUTEX_LOCK;
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 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(handle), "_dw_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	11355 if ( 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	11356 {
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 _webkit_web_view_load_html_string( web_view, string, "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	11358 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	11359 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11360 DW_MUTEX_UNLOCK;
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 return 0;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11362 #else
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11363 return -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	11364 #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	11365 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11366
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11367 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11368 * 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	11369 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11370 * 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	11371 * 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	11372 * 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	11373 * 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	11374 * 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	11375 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11376 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	11377 {
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11378 #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	11379 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11380 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	11381
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11382 if (!_webkit_web_view_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	11383 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	11384
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 DW_MUTEX_LOCK;
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 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(handle), "_dw_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	11387 if ( 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	11388 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11389 _webkit_web_view_open( web_view, 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	11390 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	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 DW_MUTEX_UNLOCK;
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 return 0;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11394 #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	11395 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	11396 #endif
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11397 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11398
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11399 #ifdef USE_WEBKIT
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 static void _dw_html_print_cb( 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	11401 {
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 WebKitWebView *web_view = DW_WEBKIT_WEB_VIEW(data);
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 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	11404
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 frame = _webkit_web_view_get_focused_frame( 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	11406 _webkit_web_frame_print( 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	11407 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11408 /*
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 * 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	11410 * 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	11411 * 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	11412 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11413 static void _dw_html_populate_popup_cb( WebKitWebView web_view, GtkMenu menu, gpointer user_data )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11414 {
1892 c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1891 diff changeset	11415 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	11416
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11417 gtk_menu_shell_append(GTK_MENU_SHELL(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	11418 g_signal_connect( item, "activate", G_CALLBACK(_dw_html_print_cb), 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	11419 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	11420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11421 #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	11422
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11423 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11424 * 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	11425 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11426 * 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	11427 * 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	11428 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11429 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	11430 {
1355 dd252596227b Removed a now unused variable on GTK in dw_html_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1354 diff changeset	11431 GtkWidget *widget = 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	11432 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11433
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11434 DW_MUTEX_LOCK;
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11435 #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	11436 if (!_webkit_web_view_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	11437 {
1358 2f5e54b0c5c4 dw_debug() lines in dw_html_new() should end with a newline. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1355 diff changeset	11438 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	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 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	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 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	11443 widget = 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	11444 gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW (widget), 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	11445 web_view = (WebKitWebView *)_webkit_web_view_new();
1320 6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1314 diff changeset	11446 /* web_view = WEBKIT_WEB_VIEW(_webkit_web_view_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	11447 gtk_container_add( GTK_CONTAINER (widget), GTK_WIDGET(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	11448 gtk_widget_show( GTK_WIDGET(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	11449 g_object_set_data(G_OBJECT(widget), "_dw_web_view", (gpointer)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	11450 g_signal_connect( web_view, "populate-popup", G_CALLBACK(_dw_html_populate_popup_cb), NULL );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11451 }
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	11452 gtk_widget_show(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	11453 #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	11454 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	11455 #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	11456 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11457 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	11458 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11459
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11460 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11461 * 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	11462 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11463 * 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	11464 * 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	11465 * 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	11466 * 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	11467 */
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 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	11469 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11470 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11471 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11472 char *ret = NULL;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11473
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11474 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11475 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	11476 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11477 gchar *clipboard_contents;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11478
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11479 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	11480 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11481 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11482 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11483 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11484 }
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11485 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11486 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	11487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11489 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11490 * 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	11491 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11492 * 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	11493 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11494 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	11495 {
971 2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11496 int _locked_by_me = FALSE;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11497 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11498
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11499 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11500 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	11501 {
2a21915684d1 Step 1 in modernizing the GTK3 module. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 959 diff changeset	11502 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	11503 }
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11504 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11505 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11506
1136 1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11507 /* 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	11508 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	11509 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11510 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	11511 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	11512 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	11513 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11514 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11515
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11516 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	11517 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11518 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	11519 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11520 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	11521 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	11522 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	11523 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11524 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	11525 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11526 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11527 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11528
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11529 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11530 * 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	11531 * Parameters:
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11532 * 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	11533 * 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	11534 * 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	11535 * 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	11536 * 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	11537 * Returns:
1137 e24e5a13ff2c Added code to test the new print functions in dwtest. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1136 diff changeset	11538 * 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	11539 */
1152 58b5374355ab Added print jobname parameter to dw_print_new(). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1149 diff changeset	11540 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	11541 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11542 GtkPrintOperation *op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11543 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	11544
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11545 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11546 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11547
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11548 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11549 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	11550 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11551 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	11552 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	11553 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	11554 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	11555 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	11556 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11557 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11558 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11559 }
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 * 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	11563 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11564 * 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	11565 * 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	11566 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11567 * 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	11568 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11569 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	11570 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11571 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11572 GtkPrintOperation op = (GtkPrintOperation )print;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11573 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	11574
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11575 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11576 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	11577 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11578 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	11579 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11580
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11581 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11582 * 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	11583 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11584 * 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	11585 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11586 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	11587 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11588 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	11589 GtkPrintOperation op = (GtkPrintOperation )print;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11590
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11591 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11592 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	11593 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11594 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11595
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11596 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1127 diff changeset	11597 * 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	11598 * 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	11599 * 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	11600 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11601 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	11602 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11603 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	11604
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11605 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	11606 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11607 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	11608
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 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	11610 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	11611 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	11612 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	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 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	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
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 /*
1384 156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11618 * Returns a pointer to a static buffer which containes the
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11619 * private application data directory.
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11620 */
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11621 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	11622 {
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11623 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11624 }
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11625
156e32814c83 Cleanup of the previous commits and added Unix support. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1373 diff changeset	11626 /*
775 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 * 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	11628 * Parameters:
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 * 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	11630 * 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	11631 * 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	11632 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11633 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	11634 {
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 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	11636
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 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	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 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	11640 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	11641 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11642
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11643 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11644 * 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	11645 * Parameters:
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 * 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	11647 * 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	11648 * 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	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 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	11651 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11652 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	11653 int _locked_by_me = FALSE;
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
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 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	11656 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	11657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11658 DW_MUTEX_LOCK;
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 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	11660 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11661 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	11662 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11663 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11664 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	11665 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11666 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11667
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11668 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11669 * 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	11670 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11671 * 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	11672 * 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	11673 * 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	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 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	11676 {
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11677 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	11678 int _locked_by_me = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11679 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	11680
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11681 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	11682 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	11683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11684 DW_MUTEX_LOCK;
784 fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11685 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11686 {
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11687 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	11688 }
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11689 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 783 diff changeset	11690 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	11691 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11692 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	11693 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11694
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	11695 /* 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	11696 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	11697 {
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 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	11699 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	11700 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	11701 int *tag = data;
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11702
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	11703 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	11704 {
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	11705 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	11706 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	11707 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	11708 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	11709 }
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	11710 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	11711 {
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 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	11713 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	11714 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	11715 }
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	11716 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	11717 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	11718 }
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
775 5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11720 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11721 * 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	11722 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11723 * 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	11724 * 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	11725 * 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	11726 * 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	11727 * 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	11728 */
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 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	11730 {
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	11731 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	11732 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	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 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	11735
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	11736 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	11737 *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	11738 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	11739 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	11740 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	11741 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	11742 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	11743 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	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
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 /*
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 * 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	11748 * Parameters:
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 * 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	11750 */
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 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	11752 {
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	11753 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	11754 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	11755
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	11756 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	11757 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	11758 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	11759 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	11760 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	11761 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	11762 }
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
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 /* 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	11765 * 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	11766 */
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 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	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 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	11770
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11771 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	11772 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	11773 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	11774 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	11775 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	11776 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	11777 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	11778 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11779
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11780 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11781 * 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	11782 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11783 * 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	11784 * 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	11785 * 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	11786 * 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	11787 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11788 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	11789 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11790 dw_signal_connect_data(window, signame, sigfunc, NULL, 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 /* 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	11794 * 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	11795 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11796 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	11797 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11798 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11799 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11800 void params = (void )data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11801 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	11802
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11803 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11804 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11805 SignalHandler work = _get_signal_handler(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11806
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11807 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11808 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11809 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	11810 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11811 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11812 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11813 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11814 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11815
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11816 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11817 * 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	11818 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11819 * 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	11820 * 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	11821 * 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	11822 * 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	11823 * 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	11824 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11825 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	11826 {
775 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 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	11828 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	11829 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	11830 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	11831 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	11832 gint cid;
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11833
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11834 /* 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	11835 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	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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11838 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11839 * If 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	11840 * 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	11841 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11842 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	11843 {
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 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	11845 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11846
779 d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11847 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	11848 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11849 thisname = "draw";
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 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	11852 {
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 = "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	11854 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	11855 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11856 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	11857 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11858 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	11859 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	11860 params[2] = (void *)thiswindow;
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), "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	11862 _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	11863
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11864 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11865 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	11866 }
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	11867 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	11868 (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	11869 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11870 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11871
775 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 thisname = "changed";
1096 5261439c7227 Fix bug with setting up container on 64bit platform. mhessling@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1092 diff changeset	11873
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11874 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	11875 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	11876 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	11877 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	11878 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 778 diff changeset	11879 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	11880 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	11881 }
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	11882 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	11883 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11884 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	11885 }
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	11886 _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	11887
775 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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11889 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	11890 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11891 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	11892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11893 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	11894 }
783 9ef49898a5e6 Container events now working except for column-click. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 782 diff changeset	11895 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	11896 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11897 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	11898 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	11899 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11900 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	11901 _set_signal_handler_id(thiswindow, sigid, cid);
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11902
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11903 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	11904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11905 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	11906 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	11907 }
786 0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11908 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	11909 {
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11910 /* 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	11911 * 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	11912 */
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11913 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	11914 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	11915 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11916 return;
0e251c2f5d08 Implemented the column click event handler... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 785 diff changeset	11917 }
775 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 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	11919 {
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 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	11921 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	11922 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	11923 }
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 788 diff changeset	11924 #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	11925 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	11926 {
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 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	11928 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	11929 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	11930 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11931 #endif
1583 525c4c9d04c6 After switching to non-deprecated functions in GTK3 like... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1579 diff changeset	11932 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	11933 {
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 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	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 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	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 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	11939 }
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
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 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	11942 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11943 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	11944 DW_MUTEX_UNLOCK;
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 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	11946 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11947
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11948 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	11949 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	11950 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11951 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	11952 _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	11953 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11954 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11955
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11956 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11957 * 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	11958 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11959 * 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	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 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	11962 {
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 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	11964 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	11965 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	11966 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	11967
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11968 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11969 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	11970 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	11971 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	11972
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 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	11974 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11975 SignalHandler sh;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11976
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	11977 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	11978 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	11979
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11980 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	11981 _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	11982 }
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 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11984 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11986 /*
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 * 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	11988 * Parameters:
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 * 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	11990 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11991 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	11992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11993 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	11994 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	11995 int _locked_by_me = FALSE;
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
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 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11998 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	11999 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	12000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12001 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	12002 _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	12003 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	12004 DW_MUTEX_UNLOCK;
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 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12006
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12007 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12008 * 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	12009 * Parameters:
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 * 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	12011 * 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	12012 */
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 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	12014 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12015 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	12016 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	12017 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	12018
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12019 DW_MUTEX_LOCK;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12020 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	12021 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	12022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12023 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	12024 {
1853 4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12025 SignalHandler sh;
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12026
4790589f52a9 Initial commit for new dw_signal_connect_data() function... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1847 diff changeset	12027 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	12028 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	12029
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12030 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	12031 _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	12032 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12033 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12034 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12035
1785 c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12036 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12037 * 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	12038 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12039 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12040 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12041 * 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	12042 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12043 */
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12044 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	12045 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12046 wchar_t retval = NULL, freeme;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12047
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12048 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12049 freeme = retval = (wchar_t *)g_utf8_to_ucs4(utf8string, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12050 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	12051 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	12052 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12053 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12054 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12055 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12056 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12057 return 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
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12060 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12061 * 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	12062 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12063 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12064 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12065 * 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	12066 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12067 */
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12068 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	12069 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12070 char retval = NULL, freeme;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12071
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12072 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12073 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	12074 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	12075 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	12076 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12077 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12078 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12079 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12080 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12081 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12082 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1769 diff changeset	12083

Mercurial > dwindows

annotate gtk3/dw.c @ 1930:fe04bcfd5b65