diff options
| author | Sven Neumann <neo@src.gnome.org> | 2001-04-03 23:11:15 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2001-04-03 23:11:15 +0000 |
| commit | 361cb7942ecc9ce39a473e49150adb67ffc0199c (patch) | |
| tree | 51c94e6af0d70c1c8a3d76d219024d5e0fa843dd | |
| parent | 4478fcca0b39a11efb1b7a87b5091fc40d7ff8c4 (diff) | |
| download | gdk-pixbuf-361cb7942ecc9ce39a473e49150adb67ffc0199c.tar.gz | |
shut up CVS
| -rw-r--r-- | gdk/.cvsignore | 1 | ||||
| -rw-r--r-- | gdk/Makefile.am | 14 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 4 | ||||
| -rw-r--r-- | gdk/gdkwindow.h | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/gdk/.cvsignore b/gdk/.cvsignore index f42a1078d..b90b69231 100644 --- a/gdk/.cvsignore +++ b/gdk/.cvsignore @@ -8,6 +8,7 @@ _libs libgdk-*.la gdkcursors.h gdkkeysyms.h +gdkenumtypes.[ch] libgdk.la gdkconfig.h stamp-gc-h diff --git a/gdk/Makefile.am b/gdk/Makefile.am index d6b770b72..4545aa370 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am for gtk+/gdk SUBDIRS=$(gdktarget) -DIST_SUBDIRS=linux-fb nanox win32 x11 +DIST_SUBDIRS=linux-fb nanox directfb win32 x11 EXTRA_DIST = \ gdkconfig.h.win32 \ @@ -124,6 +124,16 @@ libgdk_x11_include_HEADERS = $(gdk_headers) libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c 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 libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk @@ -147,7 +157,7 @@ endif # now define the real one to workaround automake's mishandling lib_LTLIBRARIES = $(extra) -EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la +EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-directfb-1.3.la libgdk-linux-fb-1.3.la MAINTAINERCLEANFILES += EXTRA_HEADERS += diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 1e6ec4bce..e70311c1d 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -710,6 +710,8 @@ gdk_window_paint_init_bg (GdkWindow *window, #include "x11/gdkx.h" #endif +#ifndef GDK_WINDOWING_DIRECTFB + /** * gdk_window_begin_paint_region: * @window: a #GdkWindow @@ -927,6 +929,8 @@ gdk_window_end_paint (GdkWindow *window) #endif /* USE_BACKING_STORE */ } +#endif + static void gdk_window_free_paint_stack (GdkWindow *window) { diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 2c8d6bab1..f125708c1 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -68,7 +68,8 @@ typedef enum GDK_WA_COLORMAP = 1 << 5, GDK_WA_VISUAL = 1 << 6, GDK_WA_WMCLASS = 1 << 7, - GDK_WA_NOREDIR = 1 << 8 + GDK_WA_NOREDIR = 1 << 8, + GDK_WA_ALPHACHANNEL = 1 << 23 } GdkWindowAttributesType; /* Size restriction enumeration. @@ -456,6 +457,9 @@ void gdk_window_unstick (GdkWindow *window); void gdk_window_maximize (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_begin_resize_drag (GdkWindow *window, |