diff options
Diffstat (limited to 'gtk')
| -rwxr-xr-x | gtk/gtk.def | 6 | ||||
| -rw-r--r-- | gtk/gtkfilesel.c | 2 | ||||
| -rw-r--r-- | gtk/makefile.cygwin | 23 | ||||
| -rwxr-xr-x | gtk/makefile.msc | 23 |
4 files changed, 46 insertions, 8 deletions
diff --git a/gtk/gtk.def b/gtk/gtk.def index a7353d55a6..27cd56983d 100755 --- a/gtk/gtk.def +++ b/gtk/gtk.def @@ -35,6 +35,7 @@ EXPORTS GTK_TYPE_GDK_DRAG_ACTION GTK_TYPE_GDK_DRAG_CONTEXT GTK_TYPE_GDK_DRAG_PROTOCOL + GTK_TYPE_GDK_DRAWABLE_TYPE GTK_TYPE_GDK_EVENT GTK_TYPE_GDK_EVENT_MASK GTK_TYPE_GDK_EVENT_TYPE @@ -72,7 +73,6 @@ EXPORTS GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE GTK_TYPE_GDK_WINDOW_CLASS GTK_TYPE_GDK_WINDOW_HINTS - GTK_TYPE_GDK_WINDOW_TYPE GTK_TYPE_GDK_WM_DECORATION GTK_TYPE_GDK_WM_FUNCTION GTK_TYPE_JUSTIFICATION @@ -576,6 +576,7 @@ EXPORTS gtk_invisible_new gtk_item_deselect gtk_item_factories_path_delete + gtk_item_factory_add_foreign gtk_item_factory_construct gtk_item_factory_create_item gtk_item_factory_create_items @@ -588,6 +589,9 @@ EXPORTS gtk_item_factory_dump_rc gtk_item_factory_from_path gtk_item_factory_from_widget + gtk_item_factory_get_item + gtk_item_factory_get_item_by_action + gtk_item_factory_get_type gtk_item_factory_get_widget gtk_item_factory_get_widget_by_action gtk_item_factory_new diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index eaa4ec8580..6987ea1388 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -2586,7 +2586,7 @@ attempt_homedir_completion(gchar* text_to_complete, #endif -#ifdef defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) +#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN) #define FOLD(c) (tolower(c)) #else #define FOLD(c) (c) diff --git a/gtk/makefile.cygwin b/gtk/makefile.cygwin index a104d62ead..de6092a762 100644 --- a/gtk/makefile.cygwin +++ b/gtk/makefile.cygwin @@ -34,7 +34,7 @@ GDKSYSDEP = ../gdk/win32 GLIB = ../../glib INTL = ../../intl -CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DGTK_DISABLE_COMPAT_H +CFLAGS = $(OPTIMIZE) -I . -I .. -I $(GDKSYSDEP) -I ../gdk -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL) -DGTK_DISABLE_COMPAT_H all : \ ../config.h \ @@ -274,8 +274,25 @@ source_headers = \ # More headers to use when autogenerating. gdk_headers = \ - ../gdk/gdktypes.h \ - ../gdk/gdkrgb.h + ../gdk/gdkcc.h \ + ../gdk/gdkcolor.h \ + ../gdk/gdkcursor.h \ + ../gdk/gdkdnd.h \ + ../gdk/gdkdrawable.h \ + ../gdk/gdkevents.h \ + ../gdk/gdkfont.h \ + ../gdk/gdkgc.h \ + ../gdk/gdkim.h \ + ../gdk/gdkimage.h \ + ../gdk/gdkinput.h \ + ../gdk/gdkpixmap.h \ + ../gdk/gdkproperty.h \ + ../gdk/gdkregion.h \ + ../gdk/gdkrgb.h \ + ../gdk/gdkselection.h \ + ../gdk/gdktypes.h \ + ../gdk/gdkvisual.h \ + ../gdk/gdkwindow.h ../config.h : ../config.h.win32 cp ../config.h.win32 ../config.h diff --git a/gtk/makefile.msc b/gtk/makefile.msc index d4688b00d9..13d6347781 100755 --- a/gtk/makefile.msc +++ b/gtk/makefile.msc @@ -46,7 +46,7 @@ GDKSYSDEP = ..\gdk\win32 GLIB = ..\..\glib INTL = ..\..\intl -CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H +CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I..\gdk -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H all : \ ..\config.h \ @@ -286,8 +286,25 @@ source_headers = \ # More headers to use when autogenerating. gdk_headers = \ - ..\gdk\gdktypes.h \ - ..\gdk\gdkrgb.h + ..\gdk\gdkcc.h \ + ..\gdk\gdkcolor.h \ + ..\gdk\gdkcursor.h \ + ..\gdk\gdkdnd.h \ + ..\gdk\gdkdrawable.h \ + ..\gdk\gdkevents.h \ + ..\gdk\gdkfont.h \ + ..\gdk\gdkgc.h \ + ..\gdk\gdkim.h \ + ..\gdk\gdkimage.h \ + ..\gdk\gdkinput.h \ + ..\gdk\gdkpixmap.h \ + ..\gdk\gdkproperty.h \ + ..\gdk\gdkregion.h \ + ..\gdk\gdkrgb.h \ + ..\gdk\gdkselection.h \ + ..\gdk\gdktypes.h \ + ..\gdk\gdkvisual.h \ + ..\gdk\gdkwindow.h ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h |