From: Michael Bedward <mbedward@ozemail.com.au>
Date: Tue, 29 Feb 2000 01:27:42 +0000 (+0000)
Subject: Changed string members in BugsGridData struct to wxChar * for Borland
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cab472ecf938770967782384cb68a1cfbbcb228a

Changed string members in BugsGridData struct to wxChar * for Borland
only and added code to BugsGridTable::SetValue() for Borland to set
string values.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/newgrid/griddemo.cpp b/samples/newgrid/griddemo.cpp
index 7272409b2e..e961046b0b 100644
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -805,22 +805,28 @@ static const wxChar* severities[] =
 static struct BugsGridData
 {
     int id;
+
+    // Borland can't deal with global wxStrings and will generate a
+    // compile time error with the initializing the gs_dataGridBugs
+    // array (below)
+    //
 #ifndef __BORLANDC__
-    wxString
+    wxString summary;
 #else
-    const wxChar *
+    wxChar *summary;
 #endif
-        summary;
+
     Severity severity;
     int prio;
+    
 #ifndef __BORLANDC__
-    wxString
+    wxString platform;
 #else
-    const wxChar *
+    wxChar *platform;
 #endif
-        platform;
+
     bool opened;
-} gs_dataBugsGrid [] =
+} gs_dataBugsGrid [] = 
 {
     { 18, _T("foo doesn't work"), Sev_Major, 1, _T("wxMSW"), TRUE },
     { 27, _T("bar crashes"), Sev_Critical, 1, _T("all"), FALSE },
@@ -940,11 +946,27 @@ void BugsGridTable::SetValue( int row, int col, const wxString& value )
             break;
 
         case Col_Summary:
+#ifndef __BORLANDC__
             gd.summary = value;
+#else
+            // this generates a warning message if you are using the
+            // memory tracing code but it should be ok :MB
+            //
+            delete gd.summary;
+            gd.summary = copystring( value.c_str() );
+#endif
             break;
 
         case Col_Platform:
+#ifndef __BORLANDC__
             gd.platform = value;
+#else            
+            // this generates a warning message if you are using the
+            // memory tracing code but it should be ok :MB
+            //
+            delete gd.platform;
+            gd.platform = copystring( value.c_str() );
+#endif
             break;
     }
 }