Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-07-01 d013a35ef5bb3b45b46362c67d6f3ca52a54e96d

 jrj/project/vindexmenu.cpp

@@ -35,8 +35,7 @@
public:
   static vindexmenu* CreateInstance(void* implPtr, void* hWnd)
   {
      vindexmenu* pWin = new vindexmenu(implPtr, (HWND)hWnd);
      return pWin;
      return new vindexmenu(implPtr, (HWND)hWnd);
   }

   int OnHideWin()
@@ -320,9 +319,9 @@
               str +=  (xstring)L"<vbox><xtree imagelist='0' name='panelTree"+xstring(no)+ L"'/></vbox>";
               //AttachEvent("panelTree"+no.toString(),"TVN_SELCHANGED",OnTreeSelChanged);
               xstring panelTree = L"panelTree"+xstring(no);
               AttachEvent(nstring::clone(panelTree.c_str()),L"TVN_ITEMEXPANDING", (FEvent)&vindexmenu::OnTreeExpanding);
               AttachEvent(nstring::clone(panelTree.c_str()),L"TVN_RCLICK", (FEvent)&vindexmenu::OnRClicked);
               AttachEvent(nstring::clone(panelTree.c_str()),L"NM_DBLCLK", (FEvent)&vindexmenu::OnDbClick);
               AttachEvent(panelTree.c_str(true),L"TVN_ITEMEXPANDING", (FEvent)&vindexmenu::OnTreeExpanding);
               AttachEvent(panelTree.c_str(true),L"TVN_RCLICK", (FEvent)&vindexmenu::OnRClicked);
               AttachEvent(panelTree.c_str(true),L"NM_DBLCLK", (FEvent)&vindexmenu::OnDbClick);
            }
            toolStr += str;
         }
@@ -458,9 +457,9 @@

   int OnInitial()
   {         
      if(GetParam())
      if(GetWinParam())
      {
         xaserverarg& arg = *(xaserverarg*)GetParam();
         xaserverarg arg = GetArg();
         m_nHwnd = (HWND)arg.GetParam(L"hwnd");
         cbx_menu = (void*)arg.GetParam(L"memuId");
         cbx_tab = (void*)arg.GetParam(L"tabNo");
@@ -475,6 +474,8 @@
      
   int onload()
   {
      SetArg();

      m_bCanDestroy = 1;      
      
      tv_menu1 = GetControl(L"menu1");