PATCH: [ 880898 ] BCMenu update to v3.034

diff --git a/Src/BCMenu.cpp b/Src/BCMenu.cpp
index eb10da1..00fed4a 100644 (file)
--- a/Src/BCMenu.cpp
+++ b/Src/BCMenu.cpp
@@ -1,7 +1,7 @@
 //*************************************************************************
 // BCMenu.cpp : implementation file
-// Version : 3.033
-// Date : April 2002
+// Version : 3.034
+// Date : May 2002
 // Author : Brent Corkum
 // Email :  corkum@rocscience.com
 // Latest Version : http://www.rocscience.com/~corkum/BCMenu.html
@@ -254,8 +254,10 @@ BOOL BCMenu::DestroyMenu()
                        if(m_AllSubMenus[n]==m_SubMenus[m])m_AllSubMenus.RemoveAt(n);
                }
                CMenu *ptr=FromHandle(m_SubMenus[m]);
-               BOOL flag=ptr->IsKindOf(RUNTIME_CLASS( BCMenu ));
-               if(flag)delete((BCMenu *)ptr);
+               if(ptr){
+                       BOOL flag=ptr->IsKindOf(RUNTIME_CLASS( BCMenu ));
+                       if(flag)delete((BCMenu *)ptr);
+               }
        }
        m_SubMenus.RemoveAll();
        // Destroy menu data
@@ -1136,7 +1138,7 @@ BOOL BCMenu::InsertODMenuW(UINT nPosition,wchar_t *lpstrText,UINT nFlags,UINT nI
                        if(nPosition<(UINT)menustart)menustart=0;
                }
                m_AllSubMenus.Add((HMENU)nID);
-               m_SubMenus.InsertAt(nPosition,(HMENU)nID);
+               m_SubMenus.Add((HMENU)nID);
        }
 
        //Stephane Clog suggested adding this, believe it or not it's in the help 
@@ -1193,7 +1195,7 @@ BOOL BCMenu::InsertODMenuW(UINT nPosition,wchar_t *lpstrText,UINT nFlags,UINT nI
        
        if(nFlags & MF_POPUP){
                m_AllSubMenus.Add((HMENU)nID);
-               m_SubMenus.InsertAt(nPosition,(HMENU)nID);
+               m_SubMenus.Add((HMENU)nID);
        }
        
        //Stephane Clog suggested adding this, believe it or not it's in the help 
@@ -2853,8 +2855,10 @@ BCMenu* BCMenu::GetSubBCMenu(wchar_t* lpszSubMenuName)
        if(mdata){
                HMENU bchmenu=(HMENU)mdata->nID;
                CMenu *ptr=FromHandle(bchmenu);
-               BOOL flag=ptr->IsKindOf(RUNTIME_CLASS( BCMenu ));
-               if(flag)return((BCMenu *)ptr);
+               if(ptr){
+                       BOOL flag=ptr->IsKindOf(RUNTIME_CLASS( BCMenu ));
+                       if(flag)return((BCMenu *)ptr);
+               }
        }
        return NULL;
 }

diff --git a/Src/BCMenu.h b/Src/BCMenu.h
index 7343169..f0cbb3b 100644 (file)
--- a/Src/BCMenu.h
+++ b/Src/BCMenu.h
@@ -1,7 +1,7 @@
 //*************************************************************************
 // BCMenu.h : header file
-// Version : 3.033
-// Date : April 2002
+// Version : 3.034
+// Date : May 2002
 // Author : Brent Corkum
 // Email :  corkum@rocscience.com
 // Latest Version : http://www.rocscience.com/~corkum/BCMenu.html

diff --git a/Src/readme.txt b/Src/readme.txt
index 9209e77..bafe210 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2004-01-21 Kimmo
+ PATCH: [ 880898 ] BCMenu update to v3.034
+  src: BCMenu.h BCMenu.cpp
+
 2004-01-20 WinMerge experimental release 2.1.5.7 (cvs)
 
 2004-01-20 Jochen