[gtkmm] Fix wrap_init() for Quartz (MacOS).
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix wrap_init() for Quartz (MacOS).
- Date: Tue, 3 Jul 2012 08:20:43 +0000 (UTC)
commit 4ebe3acb1b0e7198a138e5a7d02f98e2e07623e5
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Jul 2 18:21:39 2012 +0200
Fix wrap_init() for Quartz (MacOS).
* gtk/src/filelist.am: Set gtkmm_files_hg to a list of all .hg files.
* gtk/src/plug.hg:
* gtk/src/socket.hg: Replace _GTKMMPROC_WIN32_NO_WRAP by _INCLUDE_IN_WRAP_INIT
and _GMMPROC_WRAP_CONDITIONALLY.
This requires the latest glibmm from git master. Bug #678883.
ChangeLog | 10 ++++++++++
gtk/src/filelist.am | 10 ++++++----
gtk/src/plug.hg | 5 ++++-
gtk/src/socket.hg | 5 ++++-
4 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 17305b1..dfaf786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-02 Kjell Ahlstedt <kjell ahlstedt bredband net>
+
+ Fix wrap_init() for Quartz (MacOS).
+
+ * gtk/src/filelist.am: Set gtkmm_files_hg to a list of all .hg files.
+ * gtk/src/plug.hg:
+ * gtk/src/socket.hg: Replace _GTKMMPROC_WIN32_NO_WRAP by _INCLUDE_IN_WRAP_INIT
+ and _GMMPROC_WRAP_CONDITIONALLY.
+ This requires the latest glibmm from git master. Bug #678883.
+
2012-07-01 Mark Vender <markv743 yahoo co uk>
Pixbuf: add const version of save() and friends
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index fefa5bd..466f40e 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -227,8 +227,10 @@ else
gtkmm_files_used_hg = $(gtkmm_files_any_hg) $(gtkmm_files_arch_hg) $(gtkmm_files_deprecated_hg)
endif
-gtkmm_files_hg = $(gtkmm_files_any_hg) $(gtkmm_files_posix_hg) $(gtkmm_files_deprecated_hg)
-if GDK_TARGET_X11
-gtkmm_files_hg += $(gtkmm_files_x11_hg)
-endif
+gtkmm_files_hg = \
+ $(gtkmm_files_any_hg) \
+ $(gtkmm_files_posix_hg) \
+ $(gtkmm_files_x11_hg) \
+ $(gtkmm_files_deprecated_hg)
+
gtkmm_files_ccg = $(gtkmm_files_hg:.hg=.ccg)
diff --git a/gtk/src/plug.hg b/gtk/src/plug.hg
index 7130d34..5e037d7 100644
--- a/gtk/src/plug.hg
+++ b/gtk/src/plug.hg
@@ -22,6 +22,10 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/window_p.h)
+//This file is used only on systems with the X11 backend.
+_INCLUDE_IN_WRAP_INIT(gdk/gdk.h)dnl // If GDK_WINDOWING_X11 is defined, it's defined here.
+_GMMPROC_WRAP_CONDITIONALLY(ifdef GDK_WINDOWING_X11)
+
namespace Gtk
{
@@ -35,7 +39,6 @@ class Plug : public Window
_CLASS_GTKOBJECT(Plug, GtkPlug, GTK_PLUG, Gtk::Window, GtkWindow)
_UNMANAGEABLE
_IGNORE(gtk_plug_construct, gtk_plug_construct_for_display, _gtk_plug_add_to_socket, _gtk_plug_remove_from_socket)
- _GTKMMPROC_WIN32_NO_WRAP
public:
Plug();
diff --git a/gtk/src/socket.hg b/gtk/src/socket.hg
index 688bf9e..b729923 100644
--- a/gtk/src/socket.hg
+++ b/gtk/src/socket.hg
@@ -23,6 +23,10 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/container_p.h)
+//This file is used only on systems with the X11 backend.
+_INCLUDE_IN_WRAP_INIT(gdk/gdk.h)dnl // If GDK_WINDOWING_X11 is defined, it's defined here.
+_GMMPROC_WRAP_CONDITIONALLY(ifdef GDK_WINDOWING_X11)
+
namespace Gtk
{
@@ -80,7 +84,6 @@ class Socket : public Container
{
_CLASS_GTKOBJECT(Socket, GtkSocket, GTK_SOCKET, Gtk::Container, GtkContainer)
_IGNORE(gtk_socket_steal)
- _GTKMMPROC_WIN32_NO_WRAP
public:
_CTOR_DEFAULT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]