[GRASS-SVN] r35823 - in grass/branches/develbranch_6/gui/wxpython: gui_modules vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-02-09 08:03:29 -0500 (Mon, 09 Feb 2009)
New Revision: 35823

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
   grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i
Log:
wxGUI: avoid using void * in pseudodc.i
       (merge from trunk, r35819)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py	2009-02-09 13:01:08 UTC (rev 35822)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py	2009-02-09 13:03:29 UTC (rev 35823)
@@ -686,7 +686,6 @@
                         self.vdigitMove.has_key('beginDiff'):
                     # move line
                     for id in self.vdigitMove['id']:
-                        # print self.pdcTmp.GetIdBounds(id)
                         self.pdcTmp.TranslateId(id,
                                                 self.vdigitMove['beginDiff'][0],
                                                 self.vdigitMove['beginDiff'][1])

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i	2009-02-09 13:01:08 UTC (rev 35822)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i	2009-02-09 13:03:29 UTC (rev 35823)
@@ -1,6 +1,7 @@
 %{
 #include <wx/wxPython/wxPython.h>
 #include <wx/wxPython/pyclasses.h>
+#include <wx/dcbuffer.h>
 %}
 
 %{
@@ -33,12 +34,18 @@
 	void SetIdBounds(int, wxRect&);
 	void DrawLine(const wxPoint&, const wxPoint&);
 	%extend {
-		void DrawToDC(void *dc) {
+		void DrawToDC(wxBufferedPaintDC *dc) {
 			self->DrawToDC((wxDC *) dc);
 		}
-		void DrawToDCClipped(void *dc, const wxRect& rect) {
+		void DrawToDC(wxGCDC *dc) {
+			self->DrawToDC((wxDC *) dc);
+		}
+		void DrawToDCClipped(wxBufferedPaintDC *dc, const wxRect& rect) {
 			self->DrawToDCClipped((wxDC *) dc, rect);
 		}
+		void DrawToDCClipped(wxGCDC *dc, const wxRect& rect) {
+			self->DrawToDCClipped((wxDC *) dc, rect);
+		}
 		wxRect GetIdBounds(int id) {
 			wxRect rect;
 			self->GetIdBounds(id, rect);