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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-04 11:11:53 -0400 (Mon, 04 May 2009)
New Revision: 36982

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
   grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i
Log:
wxGUI: fix DrawBitmap
	(merge from trunk, r36981)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py	2009-05-04 15:05:25 UTC (rev 36981)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp_window.py	2009-05-04 15:11:53 UTC (rev 36982)
@@ -286,7 +286,7 @@
         if pdctype == 'image': # draw selected image
             bitmap = wx.BitmapFromImage(img)
             w,h = bitmap.GetSize()
-            pdc.DrawBitmap(bitmap, wx.Point(coords[0], coords[1]), True) # draw the composite map
+            pdc.DrawBitmap(bitmap, coords[0], coords[1], True) # draw the composite map
             pdc.SetIdBounds(drawid, wx.Rect(coords[0],coords[1], w, h))
 
         elif pdctype == 'box': # draw a box on top of the map

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i	2009-05-04 15:05:25 UTC (rev 36981)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/pseudodc.i	2009-05-04 15:11:53 UTC (rev 36982)
@@ -58,8 +58,6 @@
 	void EndDrawing();
         void SetBackground(const wxBrush&);
 	void SetId(int);
-        void DrawBitmap(const wxBitmap&, const wxPoint&,
-	                bool);
         void SetBrush(const wxBrush&);
         void SetPen(const wxPen&);
 	void SetIdBounds(int, wxRect&);
@@ -94,5 +92,9 @@
 		void DrawRotatedText(const wxString& text, float x, float y, double angle) {
 		        return self->DrawRotatedText(text, (wxCoord) x, (wxCoord) y, angle);
 		}
+                void DrawBitmap(const wxBitmap& bitmap, float x, float y, bool useMask) {
+                        return self->DrawBitmap(bitmap, (wxCoord) x, (wxCoord) y, useMask);
+                }
+
 	}
 };