OSDN Git Service

Merge Tim's fix-x64-warnings-in-bcmenu patch
authorsdottaka <none@none>
Sat, 8 Jan 2011 13:29:55 +0000 (22:29 +0900)
committersdottaka <none@none>
Sat, 8 Jan 2011 13:29:55 +0000 (22:29 +0900)
1  2 
Src/BCMenu.cpp

diff --cc Src/BCMenu.cpp
@@@ -1650,10 -1648,10 +1650,10 @@@ BCMenuData *BCMenu::FindMenuItem(UINT n
  }
  
  
 -BCMenu *BCMenu::FindAnotherMenuOption(int nId,int& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
 -                                                                        CArray<int,int&>&bclocs)
 +BCMenu *BCMenu::FindAnotherMenuOption(int nId,UINT& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
 +                                                                        CArray<UINT,UINT&>&bclocs)
  {
-       UINT i,numsubs,j;
+       int i,j;
        BCMenu *psubmenu,*pgoodmenu;
        BOOL foundflag;
        
                        pgoodmenu=psubmenu->FindAnotherMenuOption(nId,nLoc,bcsubs,bclocs);
                        if(pgoodmenu)return(pgoodmenu);
                }
 -              else if(nId==(int)GetMenuItemID(i)){
 -                      INT_PTR numsubs=bcsubs.GetSize();
 +              else if(nId==(int)GetMenuItemID((int)i)){
-                       numsubs=(UINT)bcsubs.GetSize();
++                      INT_PTR numsubs=(UINT)bcsubs.GetSize();
                        foundflag=TRUE;
                        for(j=0;j<numsubs;++j){
                                if(bcsubs[j]==this&&bclocs[j]==i){