Forráskód Böngészése

wxGUI: avoid using void * in pseudodc.i

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35819 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 éve
szülő
commit
bc0aec17f2

+ 0 - 1
gui/wxpython/gui_modules/mapdisp_window.py

@@ -686,7 +686,6 @@ class BufferedWindow(MapWindow, wx.Window):
                         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])

+ 9 - 2
gui/wxpython/vdigit/pseudodc.i

@@ -1,6 +1,7 @@
 %{
 #include <wx/wxPython/wxPython.h>
 #include <wx/wxPython/pyclasses.h>
+#include <wx/dcbuffer.h>
 %}
 
 %{
@@ -33,10 +34,16 @@ public:
 	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) {