From scm-commit at wald.intevation.org  Fri Apr 18 21:58:11 2008
From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org)
Date: Fri, 18 Apr 2008 21:58:11 +0200 (CEST)
Subject: [Thuban-commits] r2840 - in trunk/thuban: . Thuban/UI
	libraries/pyshapelib
Message-ID: <20080418195811.5B7EF4058E@pyrosoma.intevation.org>

Author: dpinte
Date: 2008-04-18 21:58:09 +0200 (Fri, 18 Apr 2008)
New Revision: 2840

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/UI/legend.py
   trunk/thuban/libraries/pyshapelib/shptreemodule.c
Log:
2008-04-18 Didrik Pinte <dpinte at dipole-consulting.com>

    * Thuban/UI/legend.py : changed the use of wx.MemoryDC to 
    wx.ScreenDC in order to allow compilation under Mac and wx 2.8

    * libraries/pyshapelib/shptreemodule.c : bugfix coming from Debian
    see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469007



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2008-02-14 00:19:14 UTC (rev 2839)
+++ trunk/thuban/ChangeLog	2008-04-18 19:58:09 UTC (rev 2840)
@@ -1,3 +1,11 @@
+2008-04-18 Didrik Pinte <dpinte at dipole-consulting.com>
+
+	* Thuban/UI/legend.py : changed the use of wx.MemoryDC to 
+	wx.ScreenDC in order to allow compilation under Mac and wx 2.8
+
+	* libraries/pyshapelib/shptreemodule.c : bugfix coming from Debian
+	see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469007
+
 2008-02-13 Bernhard Reiter <bernhard at intevation.de>
 
 	* test/test_save.py, Thuban/Model/load.py, setup.py: 

Modified: trunk/thuban/Thuban/UI/legend.py
===================================================================
--- trunk/thuban/Thuban/UI/legend.py	2008-02-14 00:19:14 UTC (rev 2839)
+++ trunk/thuban/Thuban/UI/legend.py	2008-04-18 19:58:09 UTC (rev 2840)
@@ -718,7 +718,7 @@
 
     def __init__(self, parent, map, mainWindow):
         # While the width is fixed, get the height _now_.
-        dc = wx.MemoryDC()
+        dc = wx.ScreenDC()
         textwidth, textheight = dc.GetTextExtent("%d"%0)
         self.width = 210
         self.height = textheight + 3*2 + 8

Modified: trunk/thuban/libraries/pyshapelib/shptreemodule.c
===================================================================
--- trunk/thuban/libraries/pyshapelib/shptreemodule.c	2008-02-14 00:19:14 UTC (rev 2839)
+++ trunk/thuban/libraries/pyshapelib/shptreemodule.c	2008-04-18 19:58:09 UTC (rev 2840)
@@ -42,7 +42,7 @@
 shptree_dealloc(SHPTreeObject * self)
 {
     api->SHPDestroyTree(self->tree);
-    PyMem_DEL(self);
+    PyObject_Del(self);
 }
 
 /* Return the repr of the wrapper */