* TypeGraphViewer.cs: The gdk hack is in gtk# now. yay

In src/viewer:
	* mono-heap-prof-view.exe.config: not needed
	
	(mono_heap_prof_viewdir_DATA): no longer needed 
In .:
2005-01-11  Ben Maurer  <bmaurer@ximian.com>

	* configure.in: Check for gtk-dotnet-2.0


svn path=/trunk/heap-prof/; revision=38758
This commit is contained in:
Ben Maurer 2005-01-12 03:02:53 +00:00
Родитель 2a2f650ac0
Коммит 22530ae5cd
7 изменённых файлов: 11 добавлений и 48 удалений

Просмотреть файл

@ -1,3 +1,7 @@
2005-01-11 Ben Maurer <bmaurer@ximian.com>
* configure.in: Check for gtk-dotnet-2.0
2005-01-09 Ben Maurer <bmaurer@ximian.com>
* *: Initial Import.

Просмотреть файл

@ -4,7 +4,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
PKG_CHECK_MODULES(CCOMPILE, mono glib-2.0)
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0)
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 gtk-dotnet-2.0)
AC_PATH_PROG(MCS, mcs)
AC_PATH_PROG(MONO, mono)

Просмотреть файл

@ -1,6 +1,9 @@
2005-01-11 Ben Maurer <bmaurer@ximian.com>
* mono-heap-prof-view.exe.config: not needed
* Makefile.am: Add new files
(mono_heap_prof_viewdir_DATA): no longer needed
2005-01-09 Ben Maurer <bmaurer@ximian.com>

Просмотреть файл

@ -1,7 +1,6 @@
CLEANFILES = mono-heap-prof-view.exe mono-heap-prof-view
mono_heap_prof_view_SCRIPTS = mono-heap-prof-view.exe
mono_heap_prof_view_DATA = mono-heap-prof-view.exe.config
mono_heap_prof_viewdir = $(prefix)/lib/mono-heap-prof
common_sources = \

Просмотреть файл

@ -1,5 +1,7 @@
2005-01-11 Ben Maurer <bmaurer@ximian.com>
* TypeGraphViewer.cs: The gdk hack is in gtk# now. yay
* Shell.cs: Use file chooser. Other misc ui crap
* Shell.cs: Prevent flicker

Просмотреть файл

@ -181,7 +181,7 @@ class PrettyGraphic : DrawingArea {
bitmap_cache.DrawRectangle (Style.WhiteGC, true, 0, 0,
current_allocation.Width, current_allocation.Height);
using (Graphics g = Gdk.Graphics.FromDrawable (bitmap_cache)) {
using (Graphics g = Gtk.DotNet.Graphics.FromDrawable (bitmap_cache)) {
plot = new Plotter (current_allocation.Width, current_allocation.Height, t, tl);
plot.Draw (g);
}
@ -234,42 +234,3 @@ class PrettyGraphic : DrawingArea {
}
}
namespace Gdk {
public class Graphics {
[DllImport("libgdk-win32-2.0-0.dll")]
internal static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr raw);
[DllImport("libgdk-win32-2.0-0.dll")]
internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw);
public static System.Drawing.Graphics FromDrawable (Gdk.Drawable drawable)
{
IntPtr x_drawable;
int x_off = 0, y_off = 0;
if (drawable is Gdk.Window){
((Gdk.Window) drawable).GetInternalPaintInfo(out drawable, out x_off, out y_off);
}
x_drawable = drawable.Handle;
IntPtr display = gdk_x11_drawable_get_xdisplay (x_drawable);
Type graphics = typeof (System.Drawing.Graphics);
MethodInfo mi = graphics.GetMethod ("FromXDrawable", BindingFlags.Static | BindingFlags.NonPublic);
if (mi == null)
throw new NotImplementedException ("In this implementation I can not get a graphics from a drawable");
object [] args = new object [2] { (IntPtr) gdk_x11_drawable_get_xid (drawable.Handle), (IntPtr) display };
object r = mi.Invoke (null, args);
System.Drawing.Graphics g = (System.Drawing.Graphics) r;
g.TranslateTransform (-x_off, -y_off);
return g;
}
}
}

Просмотреть файл

@ -1,6 +0,0 @@
<configuration>
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
<dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0"/>
<dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
</configuration>