decaldev-cvscommit

[<go...@us...>]

Update of /cvsroot/decaldev/source/DecalControls
In directory usw-pr-cvs1:/tmp/cvs-serv23304/DecalControls

Modified Files:
	DecalControls.rc List.cpp 
Log Message:
2.4 update

Index: DecalControls.rc
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/DecalControls.rc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** DecalControls.rc	29 Jul 2002 06:05:12 -0000	1.32
--- DecalControls.rc	10 Sep 2002 05:19:25 -0000	1.33
***************
*** 55,60 ****
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 2,3,1,3
!  PRODUCTVERSION 2,3,1,3
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
--- 55,60 ----
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 2,4,0,0
!  PRODUCTVERSION 2,4,0,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
***************
*** 74,78 ****
              VALUE "CompanyName", "\0"
              VALUE "FileDescription", "DecalControls Module\0"
!             VALUE "FileVersion", "2, 3, 1, 3\0"
              VALUE "InternalName", "DecalControls\0"
              VALUE "LegalCopyright", "Copyright 2001\0"
--- 74,78 ----
              VALUE "CompanyName", "\0"
              VALUE "FileDescription", "DecalControls Module\0"
!             VALUE "FileVersion", "2, 4, 0, 0\0"
              VALUE "InternalName", "DecalControls\0"
              VALUE "LegalCopyright", "Copyright 2001\0"
***************
*** 82,86 ****
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "DecalControls Module\0"
!             VALUE "ProductVersion", "2, 3, 1, 3\0"
              VALUE "SpecialBuild", "\0"
          END
--- 82,86 ----
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "DecalControls Module\0"
!             VALUE "ProductVersion", "2, 4, 0, 0\0"
              VALUE "SpecialBuild", "\0"
          END

Index: List.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalControls/List.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** List.cpp	8 Sep 2002 23:47:24 -0000	1.18
--- List.cpp	10 Sep 2002 05:19:25 -0000	1.19
***************
*** 53,57 ****
  
    if (m_colors) { /* cyn - 07/08/2002 */
!     delete m_colors;
    }
  }
--- 53,57 ----
  
    if (m_colors) { /* cyn - 07/08/2002 */
!     delete[] m_colors;
    }
  }
***************
*** 82,86 ****
  
    if (m_colors) { /* cyn - 07/08/2002 */
!     delete m_colors;
    }
  	m_colors = row.m_colors;
--- 82,86 ----
  
    if (m_colors) { /* cyn - 07/08/2002 */
!     delete[] m_colors;
    }
  	m_colors = row.m_colors;
***************
*** 539,542 ****
--- 539,544 ----
  STDMETHODIMP cList::put_Color(long nX, long nY, long newVal)
  {
+   int i, j;
+ 
    if (nX >= m_cols.size()) { /* cyn - 07/08/2002 */
      return E_FAIL;
***************
*** 546,550 ****
  
    if (!rowData.m_colors) {
!     rowData.m_colors = new long[ m_cols.size() ];
      if (!rowData.m_colors) {
        return E_OUTOFMEMORY;
--- 548,553 ----
  
    if (!rowData.m_colors) {
!     j = m_cols.size();
!     rowData.m_colors = new long[ j ];
      if (!rowData.m_colors) {
        return E_OUTOFMEMORY;