Patch from "Viktor Voroshylo" <viktor@voroshylo.com>
src/.cvsignore : changes to ignore temorary project files src/regex/.cvsignore : changes to ignore temorary project files for CE compiler src/regex/regguts.h : assert will be ignored under WinCE src/msw/button.cpp : BS_FLAT is not available under winCE src/msw/clipbrd.cpp : changed CLIPFORMAT to wxDataFormat::NativeFormat so it will compile when ole is not included (under winCE) src/msw/menu.cpp : GetMenuItemCount is not available under winCE. Using wxMenu::GetMenuCount in this case src/common/regex.cpp : regex will be included under wince include/wx/msw/wince/setup.h : wxUSE_THREADS & wxUSE_REGEX is enabled by default (as in standard windows configuration) src/msw/wince/wxWindowsCE.vcp: fixed problem with all configurations (except emu once) do not have procompiled headers setup correctly. Changes for compiling with regex. src/msw/wince/wxWindowsCE.vcw : added regex in workspace file git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -832,7 +832,13 @@ int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
|
||||
wxASSERT(menu);
|
||||
wxASSERT(menu->GetHMenu());
|
||||
wxASSERT(m_hMenu);
|
||||
|
||||
#if defined(__WXWINCE__)
|
||||
int totalMSWItems = GetMenuCount();
|
||||
#else
|
||||
int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
|
||||
#endif
|
||||
|
||||
int i; // For old C++ compatibility
|
||||
for(i=wxpos; i<totalMSWItems; i++)
|
||||
{
|
||||
|
Reference in New Issue
Block a user