Commit 519a4bc2 authored by Elliot Lee's avatar Elliot Lee
Browse files

cleanups for color changing stuff

parent b04290fe
......@@ -58,6 +58,7 @@ POST_UNINSTALL = true
host_alias = @host_alias@
host_triplet = @host@
CC = @CC@
CPP = @CPP@
LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
......
dnl aclocal.m4 generated automatically by aclocal 1.2
dnl aclocal.m4 generated automatically by aclocal 1.2c
dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
dnl This Makefile.in is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
......@@ -58,7 +68,7 @@ echo timestamp > conftestfile
# directory).
if (
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
if test "$@" = "X"; then
if test "[$]*" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
......@@ -338,8 +348,7 @@ AC_DEFUN(AM_MAINTAINER_MODE,
# If the C compiler in not in ANSI C mode by default, try to add an option
# to output variable @code{CC} to make it so. This macro tries various
# options that select ANSI C on some system or another. It considers the
# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
# handles function prototypes correctly.
# compiler to be in ANSI C mode if it handles function prototypes correctly.
#
# If you use this macro, you should check after calling it whether the C
# compiler has been set to accept ANSI C; if not, the shell variable
......@@ -352,6 +361,10 @@ AC_DEFUN(AM_PROG_CC_STDC,
[AC_REQUIRE([AC_PROG_CC])
AC_BEFORE([$0], [AC_C_INLINE])
AC_BEFORE([$0], [AC_C_CONST])
dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
dnl a magic option to avoid problems with ANSI preprocessor commands
dnl like #elif.
AC_BEFORE([$0], [AC_PROG_CPP])
AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
AC_CACHE_VAL(am_cv_prog_cc_stdc,
[am_cv_prog_cc_stdc=no
......@@ -366,18 +379,37 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
do
CC="$ac_save_CC $ac_arg"
AC_TRY_COMPILE(
[#if !defined(__STDC__) || __STDC__ != 1
choke me
#endif
/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/stat.h>
#endif
], [
[#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
static char *e (p, i)
char **p;
int i;
{
return p[i];
}
static char *f (char * (*g) (char **, int), char **p, ...)
{
char *s;
va_list v;
va_start (v,p);
s = g (p, va_arg (v,int));
va_end (v);
return s;
}
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};],
struct s2 {int (*f) (double a);};
int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
int argc;
char **argv;
], [
return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
],
[am_cv_prog_cc_stdc="$ac_arg"; break])
done
CC="$ac_save_CC"
......
This diff is collapsed.
......@@ -58,6 +58,7 @@ POST_UNINSTALL = true
host_alias = @host_alias@
host_triplet = @host@
CC = @CC@
CPP = @CPP@
LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
......
......@@ -3,4 +3,5 @@ Makefile
.deps
_libs
libgdk.la
gdkcursors.h
gdkkeysyms.h
......@@ -58,6 +58,7 @@ POST_UNINSTALL = true
host_alias = @host_alias@
host_triplet = @host@
CC = @CC@
CPP = @CPP@
LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
......
......@@ -22,7 +22,7 @@
#define GDK_ROOT_WINDOW() gdk_root_window
#define GDK_ROOT_PARENT() &gdk_root_parent
#define GDK_ROOT_PARENT() ((GdkWindow *)&gdk_root_parent)
#define GDK_DISPLAY() gdk_display
#define GDK_WINDOW_XDISPLAY(win) (((GdkWindowPrivate*) win)->xdisplay)
#define GDK_WINDOW_XWINDOW(win) (((GdkWindowPrivate*) win)->xwindow)
......
......@@ -22,7 +22,7 @@
#define GDK_ROOT_WINDOW() gdk_root_window
#define GDK_ROOT_PARENT() &gdk_root_parent
#define GDK_ROOT_PARENT() ((GdkWindow *)&gdk_root_parent)
#define GDK_DISPLAY() gdk_display
#define GDK_WINDOW_XDISPLAY(win) (((GdkWindowPrivate*) win)->xdisplay)
#define GDK_WINDOW_XWINDOW(win) (((GdkWindowPrivate*) win)->xwindow)
......
......@@ -58,6 +58,7 @@ POST_UNINSTALL = true
host_alias = @host_alias@
host_triplet = @host@
CC = @CC@
CPP = @CPP@
LD = @LD@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
......
......@@ -2483,15 +2483,15 @@ gtk_widget_propagate_default_style(void)
/* Set the property on the root window */
gdk_property_change(GDK_ROOT_PARENT(),
gdk_atom_intern("_GTK_DEFAULT_COLORS", FALSE),
GDK_NONE, sizeof(gushort),
GDK_NONE, 8*sizeof(gushort),
GDK_PROP_MODE_REPLACE,
gtk_widget_get_default_style(),
(guchar *)gtk_widget_get_default_style(),
GTK_STYLE_NUM_STYLECOLORS() * sizeof(GdkColor));
for(i = 0; i < 5; i++) sev.data.l[i] = 0;
sev.data_format = 32;
sev.message_type = gdk_atom_intern("_GTK_STYLE_CHANGED", FALSE);
gdk_event_send_clientmessage_toall(&sev);
gdk_event_send_clientmessage_toall((GdkEvent *)&sev);
}
/*****************************************
......
......@@ -73,7 +73,7 @@ static gint gtk_window_focus_in_event (GtkWidget *widget,
static gint gtk_window_focus_out_event (GtkWidget *widget,
GdkEventFocus *event);
static gint gtk_window_client_event (GtkWidget *widget,
GdkEvent *event);
GdkEventClient *event);
static gint gtk_window_need_resize (GtkContainer *container);
static gint gtk_real_window_move_resize (GtkWindow *window,
gint *x,
......@@ -847,7 +847,7 @@ gtk_window_style_set_event (GtkWidget *widget,
&realtype,
&retfmt,
&retlen,
(guchar *)&data) != TRUE
(guchar **)&data) != TRUE
|| retfmt != sizeof(gushort)) {
g_warning("gdk_property_get() failed in _GTK_STYLE_CHANGED\n");
return;
......@@ -873,7 +873,7 @@ gtk_window_style_set_event (GtkWidget *widget,
static gint
gtk_window_client_event (GtkWidget *widget,
GdkEvent *event)
GdkEventClient *event)
{
GdkAtom atom_styleset;
g_return_val_if_fail (widget != NULL, FALSE);
......@@ -882,7 +882,7 @@ gtk_window_client_event (GtkWidget *widget,
atom_styleset = gdk_atom_intern("_GTK_STYLE_CHANGED", FALSE);
if(event->client.message_type == atom_styleset) {
if(event->message_type == atom_styleset) {
gtk_window_style_set_event(widget, event);
}
return FALSE;
......
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