From 9002d5c31095e6bc20a1cd1dd2305da1ed860285 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 29 Oct 2004 21:44:53 +0000 Subject: [PATCH] updated 2004-10-29 Hans Breuer * gdk/makefile.msc gtk/makefile.msc.in : updated * gdk/win32/gdkdisplay-win32.c : dummy implementations for gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gdk/makefile.msc | 8 ++++++++ gdk/win32/gdkdisplay-win32.c | 16 ++++++++++++++++ gtk/gtkmodules.c | 1 + gtk/makefile.msc.in | 6 +++++- 8 files changed, 66 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 25cf5d8d4a..962abfb05b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-10-29 Hans Breuer + + * gdk/makefile.msc gtk/makefile.msc.in : updated + + * gdk/win32/gdkdisplay-win32.c : dummy implementations for + gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard + + * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR + 2004-10-29 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 25cf5d8d4a..962abfb05b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2004-10-29 Hans Breuer + + * gdk/makefile.msc gtk/makefile.msc.in : updated + + * gdk/win32/gdkdisplay-win32.c : dummy implementations for + gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard + + * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR + 2004-10-29 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 25cf5d8d4a..962abfb05b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2004-10-29 Hans Breuer + + * gdk/makefile.msc gtk/makefile.msc.in : updated + + * gdk/win32/gdkdisplay-win32.c : dummy implementations for + gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard + + * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR + 2004-10-29 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 25cf5d8d4a..962abfb05b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2004-10-29 Hans Breuer + + * gdk/makefile.msc gtk/makefile.msc.in : updated + + * gdk/win32/gdkdisplay-win32.c : dummy implementations for + gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard + + * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR + 2004-10-29 Matthias Clasen * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire diff --git a/gdk/makefile.msc b/gdk/makefile.msc index 8baf968186..ef3cec5278 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -58,6 +58,7 @@ gdk-win32-backend : all: \ ..\config.h \ gdkconfig.h \ + gdkalias.h \ gdkenumtypes.h \ gdkenumtypes.c \ gdkmarshalers.h \ @@ -142,6 +143,13 @@ gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl gdkconfig.h : gdkconfig.h.win32 copy gdkconfig.h.win32 gdkconfig.h +gdkalias.h: gdk.symbols + perl makegdkalias.pl < gdk.symbols > gdkalias.h + +gdk.def: gdk.symbols + echo EXPORTS > gdk.def + cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gdk.symbols >> gdk.def + libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \ gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \ diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 16a5127254..e2527d2ef3 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -369,3 +369,19 @@ gdk_display_request_selection_notification (GdkDisplay *display, GDK_NOTE (DND, g_print (" -> %s\n", ret ? "TRUE" : "FALSE")); return ret; } + +gboolean +gdk_display_supports_clipboard_persistence (GdkDisplay *display) +{ + return FALSE; +} + +void +gdk_display_store_clipboard (GdkDisplay *display, + GdkWindow *clipboard_window, + guint32 time_, + GdkAtom *targets, + gint n_targets) +{ + /* XXX: implement it (or maybe not as long as we don't support delayed rendering?) */ +} diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 51718c8e58..0bec50a574 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -25,6 +25,7 @@ #include "gtkmodules.h" #include "gtksettings.h" #include "gtkdebug.h" +#include "gtkprivate.h" /* GTK_LIBDIR */ #include #include /* For pango_split_file_list */ diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 3aef0bdd74..523354af36 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -103,6 +103,7 @@ gtk_OBJECTS = \ gtkeventbox.obj \ gtkexpander.obj \ gtkfilechooser.obj \ + gtkfilechooserbutton.obj \ gtkfilechooserdefault.obj \ gtkfilechooserdialog.obj \ gtkfilechooserembed.obj \ @@ -129,9 +130,9 @@ gtk_OBJECTS = \ gtkhscrollbar.obj \ gtkhseparator.obj \ gtkhsv.obj \ + gtkiconcache.obj \ gtkiconfactory.obj \ gtkicontheme.obj \ - gtkiconthemeparser.obj \ gtkiconview.obj \ gtkimage.obj \ gtkimagemenuitem.obj \ @@ -156,8 +157,10 @@ gtk_OBJECTS = \ gtkmenubar.obj \ gtkmenuitem.obj \ gtkmenushell.obj \ + gtkmenutoolbutton.obj \ gtkmessagedialog.obj \ gtkmisc.obj \ + gtkmodules.obj \ gtknotebook.obj \ gtkobject.obj \ gtkoldeditable.obj \ @@ -184,6 +187,7 @@ gtk_OBJECTS = \ gtkseparator.obj \ gtkseparatormenuitem.obj \ gtkseparatortoolitem.obj \ + gtksequence.obj \ gtksettings.obj \ gtksignal.obj \ gtksizegroup.obj \