diff options
| author | Anders Carlsson <andersca@imendio.com> | 2006-03-27 11:34:43 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2006-03-27 11:34:43 +0000 |
| commit | f09810e02542ab35c506109c83db4ac72804a0cc (patch) | |
| tree | 820a4604cd7f0ab87457a39f508932b91247dbc3 | |
| parent | ce823f5b284404aecb2b8fe388dd0e3df10fe84d (diff) | |
| download | gtk+-f09810e02542ab35c506109c83db4ac72804a0cc.tar.gz | |
Add -xobjective-c to cflags. (#335956, Lllian Angel)
2006-03-27 Anders Carlsson <andersca@imendio.com>
* gtk/Makefile.am:
Add -xobjective-c to cflags.
(#335956, Lllian Angel)
* gtk/gtkdnd-quartz.c:
(gtk_drag_dest_set_track_motion):
(gtk_drag_dest_get_track_motion):
Add stubs for new functions.
(#335955, Lillian Angel)
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 12 | ||||
| -rw-r--r-- | gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/gtkdnd-quartz.c | 19 |
4 files changed, 46 insertions, 1 deletions
@@ -1,3 +1,15 @@ +2006-03-27 Anders Carlsson <andersca@imendio.com> + + * gtk/Makefile.am: + Add -xobjective-c to cflags. + (#335956, Lllian Angel) + + * gtk/gtkdnd-quartz.c: + (gtk_drag_dest_set_track_motion): + (gtk_drag_dest_get_track_motion): + Add stubs for new functions. + (#335955, Lillian Angel) + 2006-03-27 Richard Hult <richard@imendio.com> * gdk/quartz: Add more stubs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a97e6d790c..c6f4d9e1fb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2006-03-27 Anders Carlsson <andersca@imendio.com> + + * gtk/Makefile.am: + Add -xobjective-c to cflags. + (#335956, Lllian Angel) + + * gtk/gtkdnd-quartz.c: + (gtk_drag_dest_set_track_motion): + (gtk_drag_dest_get_track_motion): + Add stubs for new functions. + (#335955, Lillian Angel) + 2006-03-27 Richard Hult <richard@imendio.com> * gdk/quartz: Add more stubs. diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 9f4a942ba9..4d24311b87 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -27,7 +27,8 @@ INCLUDES = \ -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) + $(GTK_DEP_CFLAGS) \ + $(gtk_clipboard_dnd_c_sources_CFLAGS) gtarget=$(gdktarget) @@ -566,6 +567,7 @@ gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" else gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c +gtk_clipboard_dnd_c_sources_CFLAGS = endif # we use our own built_sources variable rules to avoid automake's diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 2000b1efe1..c868674603 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -846,6 +846,25 @@ gtk_drag_dest_drop (GtkWidget *widget, } void +gtk_drag_dest_set_track_motion (GtkWidget *widget, + gboolean track_motion) +{ + g_return_if_fail (GTK_IS_WIDGET (widget)); + + /* FIXME: Implement */ +} + +gboolean +gtk_drag_dest_get_track_motion (GtkWidget *widget) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); + + /* FIXME: Implement */ + + return FALSE; +} + +void _gtk_drag_dest_handle_event (GtkWidget *toplevel, GdkEvent *event) { |