• R/O
  • SSH
  • HTTPS

vmaid: コミット


コミットメタ情報

リビジョン318 (tree)
日時2010-06-23 07:52:41
作者iwm

ログメッセージ

add gtk_event_box_set_visible_window

変更サマリ

差分

--- vmaid/trunk/ChangeLog (revision 317)
+++ vmaid/trunk/ChangeLog (revision 318)
@@ -2,6 +2,14 @@
22
33 * version 2.2.4
44
5+2010-06-23 Kazuki Iwamoto <iwm@maid.org>
6+
7+ * orz/orzmdi.c: add gtk_event_box_set_visible_window
8+
9+ * Makefile.msc.in
10+ * configure.ac
11+ * misc/gcommon.h: add USE_GLIB_EMULATE
12+
513 2010-06-20 Kazuki Iwamoto <iwm@maid.org>
614
715 * src/general.c: initialize e.next
--- vmaid/trunk/misc/gcommon.h (revision 317)
+++ vmaid/trunk/misc/gcommon.h (revision 318)
@@ -42,9 +42,7 @@
4242 #include <stdlib.h>
4343 #include <string.h>
4444 #include <time.h>
45-#ifdef USE_GTK
46-# include <gtk/gtk.h>
47-#else /* not USE_GTK */
45+#ifdef USE_GLIB_EMULATE
4846 # ifdef HAVE_STDBOOL_H
4947 # include <stdbool.h>
5048 # else /* not HAVE_STDBOOL_H */
@@ -62,7 +60,9 @@
6260 # define __bool_true_false_are_defined 1
6361 # endif /* __bool_true_false_are_defined */
6462 # endif /* not HAVE_STDBOOL_H */
65-#endif /* not USE_GTK */
63+#else /* not USE_GLIB_EMULATE */
64+# include <gtk/gtk.h>
65+#endif /* not USE_GLIB_EMULATE */
6666
6767
6868 /******************************************************************************
@@ -89,7 +89,7 @@
8989 /******************************************************************************
9090 * Basic Types *
9191 ******************************************************************************/
92-#ifndef USE_GTK /* USE_GTK */
92+#ifdef USE_GLIB_EMULATE
9393 typedef bool gboolean;
9494 typedef void *gpointer;
9595 typedef const void *gconstpointer;
@@ -130,7 +130,7 @@
130130 typedef double gdouble;
131131 typedef gulong gsize;
132132 typedef glong gssize;
133-#endif /* not USE_GTK */
133+#endif /* USE_GLIB_EMULATE */
134134 #if ! GLIB_CHECK_VERSION(2,14,0)
135135 typedef gint64 goffset;
136136 #endif /* not GLIB_CHECK_VERSION(2,14,0) */
@@ -260,13 +260,13 @@
260260 /******************************************************************************
261261 * Standard Macros *
262262 ******************************************************************************/
263-#ifndef USE_GTK
263+#ifdef USE_GLIB_EMULATE
264264 # ifdef _MSC_VER
265265 # define G_OS_WIN32
266266 # else /* not _MSC_VER */
267267 # define G_OS_UNIX
268268 # endif /* not _MSC_VER */
269-#endif /* not USE_GTK */
269+#endif /* USE_GLIB_EMULATE */
270270 #ifdef G_OS_WIN32
271271 # ifndef G_DIR_SEPARATOR
272272 # define G_DIR_SEPARATOR '\\'
--- vmaid/trunk/Makefile.msc.in (revision 317)
+++ vmaid/trunk/Makefile.msc.in (revision 318)
@@ -13,7 +13,7 @@
1313 CLFLAGS=/c /D_MBCS /DNDEBUG /DWIN32 /D_WINDOWS /D_WIN32_WINNT=0x0500 /DWINVER=0x0500 /D_CRT_SECURE_NO_DEPRECATE /Fo$@ /MD /nologo /O2 /Zm400
1414 LNFLAGS=/INCREMENTAL:NO /MACHINE:IX86 /NOLOGO /OUT:$@ /RELEASE /SUBSYSTEM:WINDOWS
1515 RCFLAGS=/c1252 /d_MBCS /dNDEBUG /dWIN32 /d_WINDOWS /d_WIN32_WINNT=0x0500 /dWINVER=0x0500 /fo$@ /l0
16-DEFINES=/DPACKAGE=\"vmaid\" /DVERSION=\"$(VERSION)\" /DBUILD_ENVIRONMENT=\"Windows\" /DENABLE_NLS=1 /DHAVE_FCNTL_H=1 /DHAVE_SYS_STAT_H=1 /DHAVE_SYS_TYPES_H=1 /DUSE_GTK=1 /DUSE_THREAD=1
16+DEFINES=/DPACKAGE=\"vmaid\" /DVERSION=\"$(VERSION)\" /DBUILD_ENVIRONMENT=\"Windows\" /DENABLE_NLS=1 /DHAVE_FCNTL_H=1 /DHAVE_SYS_STAT_H=1 /DHAVE_SYS_TYPES_H=1 /DUSE_THREAD=1
1717 INCLUDES=/I$(TOP)
1818
1919 all: avicore misc orz src locale\ja\LC_MESSAGES\vmaid.mo vmaid.exe
--- vmaid/trunk/configure.ac (revision 317)
+++ vmaid/trunk/configure.ac (revision 318)
@@ -58,7 +58,6 @@
5858 else
5959 AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Test for GTK+-2.0 failed.))
6060 fi
61-AC_DEFINE(USE_GTK,1,Define to 1 if enable GTK+.)
6261
6362 dnl **************************************************************
6463 dnl enable/disable libao support.
--- vmaid/trunk/orz/orzmdi.c (revision 317)
+++ vmaid/trunk/orz/orzmdi.c (revision 318)
@@ -1,6 +1,6 @@
11 /*
22 orzmdi
3- copyright (c) 1998-2009 Kazuki IWAMOTO http://www.maid.org/ iwm@maid.org
3+ copyright (c) 1998-2010 Kazuki Iwamoto http://www.maid.org/ iwm@maid.org
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
@@ -575,6 +575,9 @@
575575 gtk_widget_show (hbox);
576576 /* ja:ツールチップス */
577577 event = gtk_event_box_new ();
578+#if GLIB_CHECK_VERSION(2,4,0)
579+ gtk_event_box_set_visible_window (GTK_EVENT_BOX (event), FALSE);
580+#endif /* GLIB_CHECK_VERSION(2,4,0) */
578581 gtk_container_add (GTK_CONTAINER (event), hbox);
579582 gtk_tooltips_set_tip (mdi->tooltips, event, tab->file, tab->file);
580583 g_object_set_data (G_OBJECT (event), "user_data", tab);
旧リポジトリブラウザで表示