AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

fatal warning option is split up now, "--g-fatal-warnings" causes fatal

Browse Source 
Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
        "--g-fatal-warnings" causes fatal warnings in GLib,
        "--gdk-fatal-warnings" causes fatal warnings in Gdk,
        "--gtk-fatal-warnings" causes fatal warnings in Gtk.

        * gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
        * gdk/Makefile.am: define G_LOG_DOMAIN for gdk.

        * gtk/testgtk.c:
        * gdk/gxid.c:
        we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
        since automake doesn't support per target _CFLAGS yet.

        * configure.in: require GLib 1.1.3.
This commit is contained in:
Tim Janik 1998-08-16 21:15:11 +00:00 committed by Tim Janik
parent a4a3c87b3d
commit 31de6ff4e0
16 changed files with 210 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-0
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-10
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-2
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-4
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-6
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

17
ChangeLog.pre-2-8
View File

@ -1,3 +1,20 @@
Sun Aug 16 20:51:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): fatal warning option is split up now,
"--g-fatal-warnings" causes fatal warnings in GLib,
"--gdk-fatal-warnings" causes fatal warnings in Gdk,
"--gtk-fatal-warnings" causes fatal warnings in Gtk.
* gtk/Makefile.am: define G_LOG_DOMAIN for gtk.
* gdk/Makefile.am: define G_LOG_DOMAIN for gdk.
* gtk/testgtk.c:
* gdk/gxid.c:
we need ugly #undef G_LOG_DOMAIN at the start of these files currently,
since automake doesn't support per target _CFLAGS yet.
* configure.in: require GLib 1.1.3.
Sat Aug 15 03:19:30 1998 John Ellis <johne@bellatlantic.net>
* gtk/gtkctree.[ch] (gtk_ctree_set_drag_compare_func): New function

1
Makefile.am
View File

@ -13,6 +13,7 @@ EXTRA_DIST = \
TODO \
NEWS.pre-1-0 \
ChangeLog.pre-1-0 \
README.cvs-commits \
examples/README.1ST \
examples/extract.awk \
examples/extract.sh \

2
configure.in
View File

@ -138,7 +138,7 @@ fi
if test x$with_glib = x ; then
# Look for separately installed glib
AM_PATH_GLIB(1.1.1,,
AM_PATH_GLIB(1.1.3,,
AC_MSG_ERROR([
*** GLIB 1.1.1 or better is required. The latest version of GLIB
*** is always available from ftp://ftp.gtk.org.]))

1
gdk/Makefile.am
View File

@ -3,6 +3,7 @@
gdkincludedir = $(includedir)/gdk
lib_LTLIBRARIES = libgdk-1.1.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\"
libgdk_1_1_la_SOURCES = \
gdk.c \

1
gdk/gxid.c
View File

@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>

1
gdk/x11/gxid.c
View File

@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>

1
gtk/Makefile.am
View File

@ -1,6 +1,7 @@
### Process this file with automake to produce Makefile.in
gtkincludedir = $(includedir)/gtk
DEFS += -DG_LOG_DOMAIN=\"Gtk\"
lib_LTLIBRARIES = libgtk-1.1.la

37
gtk/gtkmain.c
View File

@ -238,13 +238,12 @@ gtk_init (int *argc,
if (gtk_initialized)
return;
if (0)
{
g_set_error_handler (gtk_error);
g_set_warning_handler (gtk_warning);
g_set_message_handler (gtk_message);
g_set_print_handler (gtk_print);
}
#if 0
g_set_error_handler (gtk_error);
g_set_warning_handler (gtk_warning);
g_set_message_handler (gtk_message);
g_set_print_handler (gtk_print);
#endif
/* Initialize "gdk". We pass along the 'argc' and 'argv'
* parameters as they contain information that GDK uses
@ -310,7 +309,29 @@ gtk_init (int *argc,
}
else if (strcmp ("--g-fatal-warnings", (*argv)[i]) == 0)
{
g_set_warning_handler ((GWarningFunc)g_error);
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask (g_log_domain_glib, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask (g_log_domain_glib, fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gdk-fatal-warnings", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask ("Gdk", G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask ("Gdk", fatal_levels);
(*argv)[i] = NULL;
}
else if (strcmp ("--gtk-fatal-warnings", (*argv)[i]) == 0)
{
GLogLevelFlags fatal_levels;
fatal_levels = g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_FATAL_MASK);
fatal_levels |= G_LOG_LEVEL_WARNING;
g_log_set_fatal_mask (G_LOG_DOMAIN, fatal_levels);
(*argv)[i] = NULL;
}
i += 1;

47
gtk/testgtk.c
View File

@ -16,6 +16,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>
@ -2121,29 +2122,37 @@ create_menus (void)
gtk_widget_destroy (window);
}
static void
gtk_ifactory_cb (gpointer callback_data,
guint callback_action,
GtkWidget *widget)
{
g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget));
}
static GtkItemFactoryEntry menu_items[] =
{
{ "/_File", NULL, NULL, 0, "<Branch>" },
{ "/File/tearoff1", NULL, NULL, 0, "<Tearoff>" },
{ "/File/_New", "<control>N", NULL, 0 },
{ "/File/_Open", "<control>O", NULL, 0 },
{ "/File/_Save", "<control>S", NULL, 0 },
{ "/File/Save _As...", NULL, NULL, 0 },
{ "/File/sep1", NULL, NULL, 0, "<Separator>" },
{ "/File/_Quit", "<control>Q", NULL, 0 },
{ "/_File", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/File/tearoff1", NULL, gtk_ifactory_cb, 0, "<Tearoff>" },
{ "/File/_New", "<control>N", gtk_ifactory_cb, 0 },
{ "/File/_Open", "<control>O", gtk_ifactory_cb, 0 },
{ "/File/_Save", "<control>S", gtk_ifactory_cb, 0 },
{ "/File/Save _As...", NULL, gtk_ifactory_cb, 0 },
{ "/File/sep1", NULL, gtk_ifactory_cb, 0, "<Separator>" },
{ "/File/_Quit", "<control>Q", gtk_ifactory_cb, 0 },
{ "/_Preferences", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/_Color", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/Color/_Red", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Green", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Blue", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/_Shape", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/Shape/_Square", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Rectangle", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Oval", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/_Color", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/Color/_Red", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Green", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Blue", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/_Shape", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/Shape/_Square", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Help", NULL, NULL, 0, "<LastBranch>" },
{ "/Help/_About", NULL, NULL, 0 },
{ "/_Help", NULL, gtk_ifactory_cb, 0, "<LastBranch>" },
{ "/Help/_About", NULL, gtk_ifactory_cb, 0 },
};
static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);

47
tests/testgtk.c
View File

@ -16,6 +16,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>
@ -2121,29 +2122,37 @@ create_menus (void)
gtk_widget_destroy (window);
}
static void
gtk_ifactory_cb (gpointer callback_data,
guint callback_action,
GtkWidget *widget)
{
g_message ("ItemFactory: activated \"%s\"", gtk_item_factory_path_from_widget (widget));
}
static GtkItemFactoryEntry menu_items[] =
{
{ "/_File", NULL, NULL, 0, "<Branch>" },
{ "/File/tearoff1", NULL, NULL, 0, "<Tearoff>" },
{ "/File/_New", "<control>N", NULL, 0 },
{ "/File/_Open", "<control>O", NULL, 0 },
{ "/File/_Save", "<control>S", NULL, 0 },
{ "/File/Save _As...", NULL, NULL, 0 },
{ "/File/sep1", NULL, NULL, 0, "<Separator>" },
{ "/File/_Quit", "<control>Q", NULL, 0 },
{ "/_File", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/File/tearoff1", NULL, gtk_ifactory_cb, 0, "<Tearoff>" },
{ "/File/_New", "<control>N", gtk_ifactory_cb, 0 },
{ "/File/_Open", "<control>O", gtk_ifactory_cb, 0 },
{ "/File/_Save", "<control>S", gtk_ifactory_cb, 0 },
{ "/File/Save _As...", NULL, gtk_ifactory_cb, 0 },
{ "/File/sep1", NULL, gtk_ifactory_cb, 0, "<Separator>" },
{ "/File/_Quit", "<control>Q", gtk_ifactory_cb, 0 },
{ "/_Preferences", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/_Color", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/Color/_Red", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Green", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Blue", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/_Shape", NULL, NULL, 0, "<Branch>" },
{ "/_Preferences/Shape/_Square", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Rectangle", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Oval", NULL, NULL, 0, "<RadioItem>" },
{ "/_Preferences", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/_Color", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/Color/_Red", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Green", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Color/_Blue", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/_Shape", NULL, gtk_ifactory_cb, 0, "<Branch>" },
{ "/_Preferences/Shape/_Square", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "<RadioItem>" },
{ "/_Help", NULL, NULL, 0, "<LastBranch>" },
{ "/Help/_About", NULL, NULL, 0 },
{ "/_Help", NULL, gtk_ifactory_cb, 0, "<LastBranch>" },
{ "/Help/_About", NULL, gtk_ifactory_cb, 0 },
};
static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);