fix build for digital mars 8.35 and grid samples

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

samples/grid/makefile.sc

@@ -1,6 +1,6 @@
 #Digital Mars (was Symantec) C++ makefile 
 WXDIR = ..\..
 EXTRALIBS=
-TARGET=griddemo
+TARGET=grid
 OBJECTS= $(TARGET).obj
 include $(WXDIR)\src\makeprog.sc

samples/newgrid/makefile.sc

@@ -1,36 +1,6 @@
-# Symantec C++ makefile
+#Digital Mars (was Symantec) C++ makefile 
-
+WXDIR = ..\..
-WXDIR = $(WXWIN)
+EXTRALIBS=
-WXLIB = $(WXDIR)\lib\wx.lib
-INCDIR = $(WXDIR)\include
-INCLUDE=$(INCDIR)
 TARGET=griddemo
-
+OBJECTS= $(TARGET).obj
-include $(WXDIR)\src\makesc.env
+include $(WXDIR)\src\makeprog.sc
-
-griddemo.exe: griddemo.obj $(DEFFILE) griddemo.res
-	*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
-    *$(RC) -k griddemo.res
-
-sc32.def:
-     echo EXETYPE NT > sc32.def
-     echo SUBSYSTEM WINDOWS >> sc32.def
-
-sc16.def:
-     echo NAME $(TARGET) > sc16.def
-     echo EXETYPE WINDOWS >> sc16.def
-     echo STUB         'WINSTUB.EXE' >> sc16.def
-     echo CODE         PRELOAD MOVEABLE DISCARDABLE >> sc16.def
-     echo DATA         PRELOAD MOVEABLE MULTIPLE >> sc16.def
-     echo HEAPSIZE     1024 >> sc16.def
-     echo STACKSIZE    8192 >> sc16.def
-
-clean:
-    -del *.obj
-	-del *.exe
-	-del *.res
-	-del *.map
-	-del *.rws
-    -del sc32.def
-    -del sc16.def
-

src/generic/gridsel.cpp

@@ -931,33 +931,35 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
     count = m_rowSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
-        int & rowOrCol = m_rowSelection[n];
+      int  rowOrCol_ = m_rowSelection [ n ];
-        if ( (size_t)rowOrCol >= pos )
+
-        {
+      if ( ( size_t ) rowOrCol_ >= pos )
-            if ( numRows > 0 )
+      {
-            {
+          if ( numRows > 0 )
-                // If rows inserted, include row counter where necessary
+          {
-                rowOrCol += numRows;
+              m_rowSelection [ n ] += numRows;
-            }
+          }
-            else if ( numRows < 0)
+          else if ( numRows < 0 )
-            {
+          {
-                // If rows deleted, either decrement row counter (if row still exists)
+              if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) )
-                if ((size_t)rowOrCol >= pos - numRows)
+                  m_rowSelection [ n ] += numRows;
-                    rowOrCol += numRows;
+              else
-                else
+              {
-                {
+                  m_rowSelection.RemoveAt ( n );
-                    m_rowSelection.RemoveAt(n);
+                  n--;
-                    n--; count--;
+                  count--;
-                }
+              }
-            }
+          }
-        }
+      }
     }
     // No need to touch selected columns, unless we removed _all_
     // rows, in this case, we remove all columns from the selection.
+
     if ( !m_grid->GetNumberRows() )
         m_colSelection.Clear();
 }
 
+
 void wxGridSelection::UpdateCols( size_t pos, int numCols )
 {
     size_t count = m_cellSelection.GetCount();
@@ -1037,23 +1039,20 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
     count = m_colSelection.GetCount();
     for ( n = 0; n < count; n++ )
     {
-        int & rowOrCol = m_colSelection[n];
+        int   rowOrCol = m_colSelection [ n ];
-        if ( (size_t)rowOrCol >= pos )
+        if ( ( size_t ) rowOrCol >= pos )
         {
             if ( numCols > 0 )
+                m_colSelection [ n ] += numCols;
+            else if ( numCols < 0 )
             {
-                // If cols inserted, include col counter where necessary
+                if ( ( size_t ) rowOrCol >= ( pos -numCols ) )
-                rowOrCol += numCols;
+                    m_colSelection [ n ] += numCols;
-            }
-            else if ( numCols < 0)
-            {
-                // If cols deleted, either decrement col counter (if col still exists)
-                if ((size_t)rowOrCol >= pos - numCols)
-                    rowOrCol += numCols;
                 else
                 {
-                    m_colSelection.RemoveAt(n);
+                    m_colSelection.RemoveAt ( n );
-                    n--; count--;
+                    n--;
+                    count--;
                 }
             }
         }
@@ -1065,6 +1064,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
         m_rowSelection.Clear();
 }
 
+
 int wxGridSelection::BlockContain( int topRow1, int leftCol1,
                                    int bottomRow1, int rightCol1,
                                    int topRow2, int leftCol2,