@@ -1,3 +1,9 @@ +2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> + + * GeneratedPInvokes.cs: Regenerated. + + r: sde + 2009-11-09 Chris Toshok <toshok@ximian.com> * NativeDependencyObjectHelper.cs (CreateObject): add mappings for class/System.Windows/Mono/ChangeLog @@ -1364,8 +1364,8 @@ namespace Mono { public extern static IntPtr moon_window_gtk_get_native_widget (IntPtr instance); [DllImport ("moon")] - // MoonWindowGtk *moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent); - public extern static IntPtr moon_window_gtk_new ([MarshalAs (UnmanagedType.U1)] bool fullscreen, int w, int h, IntPtr parent); + // MoonWindowGtk *moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent, Surface *surface); + public extern static IntPtr moon_window_gtk_new ([MarshalAs (UnmanagedType.U1)] bool fullscreen, int w, int h, IntPtr parent, IntPtr surface); [DllImport ("moon")] // MouseButtonEventArgs *mouse_button_event_args_new (); class/System.Windows/Mono/GeneratedPInvokes.cs @@ -1,3 +1,9 @@ +2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> + + * Moonlight.Gtk/MoonlightHost.cs: Updated according to api changes. + + r: sde + 2009-10-28 Larry Ewing <lewing@novell.com> * moonlight-gtk.pc.in (Libs): add System.Windows.Browser.dll to libs. gtk/ChangeLog @@ -67,7 +67,7 @@ namespace Moonlight.Gtk public MoonlightHost () { Mono.Xaml.XamlLoader.AllowMultipleSurfacesPerDomain = true; - window = NativeMethods.moon_window_gtk_new (false, 0, 0, IntPtr.Zero); + window = NativeMethods.moon_window_gtk_new (false, 0, 0, IntPtr.Zero, IntPtr.Zero); surface = NativeMethods.surface_new (window); Raw = NativeMethods.moon_window_gtk_get_native_widget (window); gtk/Moonlight.Gtk/MoonlightHost.cs @@ -1,3 +1,16 @@ +2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> + + * window.h: + * window-gtk.h|cpp: Add a surface ctor parameter. + + * runtime.cpp: Pass the surface as a parameter to the ctor instead of + setting it afterwards, since the window ctor will end up needing the + surface. + + * cbinding.h|cpp: Regenerated. + + r: sde + 2009-11-09 Andreia Gaita <avidigal@novell.com> * dependencyproperty.cpp: if the unresolved Target name is not found src/ChangeLog @@ -3319,9 +3319,9 @@ moon_window_gtk_get_native_widget (MoonWindowGtk *instance) MoonWindowGtk * -moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent) +moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent, Surface *surface) { - return new MoonWindowGtk (fullscreen, w, h, parent); + return new MoonWindowGtk (fullscreen, w, h, parent, surface); } src/cbinding.cpp @@ -2090,7 +2090,7 @@ void moon_window_set_transparent (MoonWindow *instance, bool flag); void *moon_window_gtk_get_native_widget (MoonWindowGtk *instance); /* @GeneratePInvoke */ -MoonWindowGtk *moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent); +MoonWindowGtk *moon_window_gtk_new (bool fullscreen, int w, int h, MoonWindow *parent, Surface *surface); /** * MouseButtonEventArgs src/cbinding.h @@ -941,8 +941,7 @@ Surface::UpdateFullScreen (bool value) return; if (value) { - fullscreen_window = new MoonWindowGtk (true, -1, -1, normal_window); - fullscreen_window->SetSurface (this); + fullscreen_window = new MoonWindowGtk (true, -1, -1, normal_window, this); active_window = fullscreen_window; src/runtime.cpp @@ -15,8 +15,8 @@ #include "deployment.h" #include "timemanager.h" -MoonWindowGtk::MoonWindowGtk (bool fullscreen, int w, int h, MoonWindow *parent) - : MoonWindow (w, h) +MoonWindowGtk::MoonWindowGtk (bool fullscreen, int w, int h, MoonWindow *parent, Surface *surface) + : MoonWindow (w, h, surface) { this->fullscreen = fullscreen; src/window-gtk.cpp @@ -24,7 +24,7 @@ class MoonWindowGtk : public MoonWindow { public: /* @GenerateCBinding,GeneratePInvoke */ - MoonWindowGtk (bool fullscreen, int w = -1, int h = -1, MoonWindow* parent = NULL); + MoonWindowGtk (bool fullscreen, int w = -1, int h = -1, MoonWindow* parent = NULL, Surface *surface = NULL); virtual ~MoonWindowGtk (); src/window-gtk.h @@ -33,7 +33,7 @@ class Surface; /* @Namespace=System.Windows */ class MoonWindow { public: - MoonWindow (int w, int h) : width(w), height(h), surface(NULL), transparent(false) { } + MoonWindow (int w, int h, Surface *s = NULL) : width(w), height(h), surface(s), transparent(false) { } virtual ~MoonWindow () { } src/window.h a4a8fa5728f3d2b3acea8943e0c3ae50e91d9591 rolf rolf@e3ebcda4-bce8-0310-ba0a-eca2169e7518 http://github.com/myabc/moonlight/commit/2f5362910221498f9377eb1baa3328e626c304a3 2f5362910221498f9377eb1baa3328e626c304a3 2009-11-10T02:09:14-08:00 2009-11-10T02:09:14-08:00 In class/System.Windows/Mono: 2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> * GeneratedPInvokes.cs: Regenerated. r: sde In gtk: 2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> * Moonlight.Gtk/MoonlightHost.cs: Updated according to api changes. r: sde In src: 2009-11-10 Rolf Bjarne Kvinge <RKvinge@novell.com> * window.h: * window-gtk.h|cpp: Add a surface ctor parameter. * runtime.cpp: Pass the surface as a parameter to the ctor instead of setting it afterwards, since the window ctor will end up needing the surface. * cbinding.h|cpp: Regenerated. r: sde git-svn-id: svn://anonsvn.mono-project.com/source/trunk/moon@145822 e3ebcda4-bce8-0310-ba0a-eca2169e7518 0cb2634284aab7c6da5d65f16cc940f5faa949f7 rolf rolf@e3ebcda4-bce8-0310-ba0a-eca2169e7518