update menu

xj qian

2024-07-23 abf4b5dc24ce08d0b96da1bef2b283a7987185eb

update menu

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -434,9 +434,6 @@
    <ClCompile Include="..\project\vindexform.cpp">
      <Filter>vbusiness\wface</Filter>
    </ClCompile>
    <ClCompile Include="..\project\vindexmenu.cpp">
      <Filter>vbusiness\wface</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\EnquiryEx3.list.cpp">
      <Filter>project\business</Filter>
    </ClCompile>
@@ -1250,5 +1247,8 @@
    <ClCompile Include="..\project\business\Expense\APNew.cpp">
      <Filter>project\business\VATNotify</Filter>
    </ClCompile>
    <ClCompile Include="..\project\vindexmenu.cpp">
      <Filter>vbusiness\wface</Filter>
    </ClCompile>
  </ItemGroup>
</Project>

 jrj/project/vindexform.cpp

@@ -103,9 +103,8 @@
        if (!hMenu)
        {
            HWND hw = m_hMenu;
            bool f = IsWindow(hw);

            if (hw == 0 && f <= 0)
            bool bwin = hw ? IsWindow(hw):false;
            if (!bwin)
            {
                xaserverarg* arg = new xaserverarg();
                HWND hWnd = GetHWND();
@@ -256,9 +255,16 @@

    int ResetMenu()
    {
        ::DestroyWindow(m_hMenu);
        m_hMenu = 0;
        return 1;

        //if(m_nHwnd) xwin::CloseWindow(m_nHwnd);
        m_nHwnd = 0;
        OnMenu(NULL);
        OnMenuAgent(L"");

#if 0
        menuShow = -1;
        xstring f = getHomeConfig(L"menuposition");
        if (f == L"0")
@@ -267,6 +273,7 @@
            OnMenuAgent(L"");
        }


        xaserverarg arg;
    
        HWND h = GetHWND();
@@ -274,7 +281,7 @@
        arg.SetParam(L"hwnd", h);
        
        OpenWindow(L"dev:xpage[vindexforold.vx]", arg);

#endif
        return 1;
    }


 jrj/project/vindexmenu.cpp

@@ -56,7 +56,7 @@
        int WA_ACTIVE     =  1;
        int WA_CLICKACTIVE = 2;
        int SW_HIDE=0x1;
        WPARAM lw = evt->wParam & 0xffff;
        WPARAM lw = evt->wParam;
        int x = m_bCanDestroy;
        if( lw ==WA_INACTIVE && x==1 )
        {