Changeset 36220

Timestamp:

Mar 6, 2009, 2:53:41 PM (15 years ago)

Author:

martinl

Message:

wxGUI osgeo4w patch applied (by jef)

​http://trac.osgeo.org/grass/ticket/519

Location:

grass/branches/develbranch_6/gui/wxpython

Files:

• nviz/nviz.h (modified) (2 diffs)
• nviz/setup.py (added)
• vdigit/digit.cpp (modified) (1 diff)
• vdigit/driver.h (modified) (1 diff)
• vdigit/driver_draw.cpp (modified) (6 diffs)
• vdigit/message.cpp (modified) (1 diff)
• vdigit/setup.py (added)

grass/branches/develbranch_6/gui/wxpython/nviz/nviz.h

@@ -1 +1 @@
 #ifndef WXNVIZ_H
 #define WXNVIZ_H
+
+// For compilers that support precompilation, includes "wx.h".
+#include <wx/wxprec.h>
 
 #include <vector>
@@ -11 +14 @@
 }
 
-// For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
 
 #ifdef __BORLANDC__

grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp

@@ -15 +15 @@
 #include "driver.h"
 #include "digit.h"
+
+#ifdef _WIN32
+#ifndef _CPPRTTI
+#error "compile with /GR!"
+#endif
+#endif
 
 /**

grass/branches/develbranch_6/gui/wxpython/vdigit/driver.h

@@ -25 +25 @@
 #include <Python.h>
 #include "pseudodc.h"
+#include <wx/gdicmn.h>
 
 extern "C" {

grass/branches/develbranch_6/gui/wxpython/vdigit/driver_draw.cpp

@@ -19 +19 @@
 
 #include "driver.h"
+
 
 /**
@@ -194 +195 @@
 
     // convert EN -> xy
-    wxPoint wxPoints[points->n_points];
+    wxPoint *wxPoints = new wxPoint[points->n_points];
 
     for (int i = 0; i < points->n_points; i++) {
@@ -204 +205 @@
     // draw polygon
     dc->DrawPolygon(points->n_points, wxPoints);
+
+    delete [] wxPoints;
 
     return 1;
@@ -353 +356 @@
             }
             else {
-                wxPoint wxPoints[pointsScreen->GetCount()];
+                wxPoint *wxPoints = new wxPoint[pointsScreen->GetCount()];
                 for (size_t i = 0; i < pointsScreen->GetCount(); i++) {
                     wxPoint *point_beg = (wxPoint *) pointsScreen->Item(i)->GetData();
@@ -360 +363 @@
                 
                 pdc->DrawLines(pointsScreen->GetCount(), wxPoints);
+
+                delete [] wxPoints;
 
                 if (!IsSelected(line) && settings.direction.enabled) {
@@ -680 +685 @@
 
     angle_symb = angle - M_PI / 2.;
-    x = x1 + size * std::cos(angle_symb);
-    y = y1 - size * std::sin(angle_symb);
+    x = x1 + size * cos(angle_symb);
+    y = y1 - size * sin(angle_symb);
     dc->DrawLine((wxCoord) x, (wxCoord) y, (wxCoord) x0, (wxCoord) y0);
     
     angle_symb = M_PI / 2. + angle;
-    x = x1 + size * std::cos(angle_symb);
-    y = y1 - size * std::sin(angle_symb);
+    x = x1 + size * cos(angle_symb);
+    y = y1 - size * sin(angle_symb);
     dc->DrawLine((wxCoord) x0, (wxCoord) y0, (wxCoord) x, (wxCoord) y);
 

grass/branches/develbranch_6/gui/wxpython/vdigit/message.cpp

@@ -92 +92 @@
 {
     wxString msg;
-    msg.Printf(_("Unable to open background vector map <%s>. "
-                 "Please check digitizer settings."),
+    msg.Printf(_("Unable to open background vector map <%s>. Please check digitizer settings."),
                wxString (bgmap, wxConvUTF8).c_str());
     wxMessageDialog dlg(parentWin, msg,