Commit 31de6ff4 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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

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.
parent a4a3c87b
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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 \
......
......@@ -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.]))
......
......@@ -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 \
......
......@@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>
......
......@@ -3,6 +3,7 @@
*
* Copyright 1997 Owen Taylor <owt1@cornell.edu>
*/
#undef G_LOG_DOMAIN
#include <stdio.h>
#include <stdlib.h>
......
### Process this file with automake to produce Makefile.in
gtkincludedir = $(includedir)/gtk
DEFS += -DG_LOG_DOMAIN=\"Gtk\"
lib_LTLIBRARIES = libgtk-1.1.la
......
......@@ -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;
......
......@@ -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 },
{ "/_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>" },
{ "/_Help", NULL, NULL, 0, "<LastBranch>" },
{ "/Help/_About", NULL, 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, 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, gtk_ifactory_cb, 0, "<LastBranch>" },
{ "/Help/_About", NULL, gtk_ifactory_cb, 0 },
};
static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
......
......@@ -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 },
{ "/_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>" },
{ "/_Help", NULL, NULL, 0, "<LastBranch>" },
{ "/Help/_About", NULL, 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, 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, gtk_ifactory_cb, 0, "<LastBranch>" },
{ "/Help/_About", NULL, gtk_ifactory_cb, 0 },
};
static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment