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 7272409b2ea643e1eacfa65eb5391a0bad3ff207..e961046b0b3239ef03acdeeb9e5cd5edc6667952 100644 (file)
--- a/samples/newgrid/griddemo.cpp
+++ b/samples/newgrid/griddemo.cpp
@@ -805,22 +805,28 @@ static const wxChar* severities[] =
 static struct BugsGridData
 {
     int id;
 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__
 #ifndef __BORLANDC__

-    wxString
+    wxString summary;

 #else
 #else

-    const wxChar *
+    wxChar *summary;

 #endif
 #endif

-        summary;
+

     Severity severity;
     int prio;
     Severity severity;
     int prio;

+    

 #ifndef __BORLANDC__
 #ifndef __BORLANDC__

-    wxString
+    wxString platform;

 #else
 #else

-    const wxChar *
+    wxChar *platform;

 #endif
 #endif

-        platform;
+

     bool opened;
     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 },
 {
     { 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:
             break;
 
         case Col_Summary:

+#ifndef __BORLANDC__

             gd.summary = value;
             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:
             break;
 
         case Col_Platform:

+#ifndef __BORLANDC__

             gd.platform = value;
             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;
     }
 }
             break;
     }
 }