sorry, I only wanted to commit .cvsignore

I'm stupid and perhaps a bit tired ...
This commit is contained in:
Sven Neumann 2001-04-03 23:14:26 +00:00
parent 361cb7942e
commit 2fe6c1d47c
3 changed files with 3 additions and 21 deletions

View File

@ -1,7 +1,7 @@
## Makefile.am for gtk+/gdk ## Makefile.am for gtk+/gdk
SUBDIRS=$(gdktarget) SUBDIRS=$(gdktarget)
DIST_SUBDIRS=linux-fb nanox directfb win32 x11 DIST_SUBDIRS=linux-fb nanox win32 x11
EXTRA_DIST = \ EXTRA_DIST = \
gdkconfig.h.win32 \ gdkconfig.h.win32 \
@ -124,16 +124,6 @@ libgdk_x11_include_HEADERS = $(gdk_headers)
libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
endif endif
if USE_DIRECTFB
libgdk_directfb_includedir = $(includedir)/gtk-2.0/gdk
libgdk_directfb_1_3_la_LIBADD = \
$(gtarget)/libgdk-$(gtarget).la
libgdk_directfb_include_HEADERS = $(gdk_headers)
libgdk_directfb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
endif
if USE_NANOX if USE_NANOX
libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
@ -157,7 +147,7 @@ endif
# now define the real one to workaround automake's mishandling # now define the real one to workaround automake's mishandling
lib_LTLIBRARIES = $(extra) lib_LTLIBRARIES = $(extra)
EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-directfb-1.3.la libgdk-linux-fb-1.3.la EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
MAINTAINERCLEANFILES += MAINTAINERCLEANFILES +=
EXTRA_HEADERS += EXTRA_HEADERS +=

View File

@ -710,8 +710,6 @@ gdk_window_paint_init_bg (GdkWindow *window,
#include "x11/gdkx.h" #include "x11/gdkx.h"
#endif #endif
#ifndef GDK_WINDOWING_DIRECTFB
/** /**
* gdk_window_begin_paint_region: * gdk_window_begin_paint_region:
* @window: a #GdkWindow * @window: a #GdkWindow
@ -929,8 +927,6 @@ gdk_window_end_paint (GdkWindow *window)
#endif /* USE_BACKING_STORE */ #endif /* USE_BACKING_STORE */
} }
#endif
static void static void
gdk_window_free_paint_stack (GdkWindow *window) gdk_window_free_paint_stack (GdkWindow *window)
{ {

View File

@ -68,8 +68,7 @@ typedef enum
GDK_WA_COLORMAP = 1 << 5, GDK_WA_COLORMAP = 1 << 5,
GDK_WA_VISUAL = 1 << 6, GDK_WA_VISUAL = 1 << 6,
GDK_WA_WMCLASS = 1 << 7, GDK_WA_WMCLASS = 1 << 7,
GDK_WA_NOREDIR = 1 << 8, GDK_WA_NOREDIR = 1 << 8
GDK_WA_ALPHACHANNEL = 1 << 23
} GdkWindowAttributesType; } GdkWindowAttributesType;
/* Size restriction enumeration. /* Size restriction enumeration.
@ -457,9 +456,6 @@ void gdk_window_unstick (GdkWindow *window);
void gdk_window_maximize (GdkWindow *window); void gdk_window_maximize (GdkWindow *window);
void gdk_window_unmaximize (GdkWindow *window); void gdk_window_unmaximize (GdkWindow *window);
void gdk_window_set_opacity (GdkWindow *window,
gdouble opacity);
void gdk_window_register_dnd (GdkWindow *window); void gdk_window_register_dnd (GdkWindow *window);
void gdk_window_begin_resize_drag (GdkWindow *window, void gdk_window_begin_resize_drag (GdkWindow *window,