Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small WinCE symbol fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-06-13 16:11:40 +00:00
parent bfe1328804
commit 3fd239fab9
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/menu.cpp
View File

@@ -744,12 +744,12 @@ void wxMenuBar::Refresh()
{ {
wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") ); wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
#if defined(WINCE_WITH_COMMANDBAR) #if defined(WINCE_WITHOUT_COMMANDBAR)
if (GetToolBar()) if (GetToolBar())
{ {
CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0); CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
} }
#elif defined(WINCE_WITHOUT_COMMANDBAR) #elif defined(WINCE_WITH_COMMANDBAR)
if (m_commandBar) if (m_commandBar)
DrawMenuBar((HWND) m_commandBar); DrawMenuBar((HWND) m_commandBar);
#else #else
@@ -1171,24 +1171,9 @@ void wxMenuBar::Attach(wxFrame *frame)
{ {
wxMenuBarBase::Attach(frame); wxMenuBarBase::Attach(frame);
#if defined(__WXWINCE__) #if defined(WINCE_WITH_COMMANDBAR)
if (!m_hMenu) if (!m_hMenu)
this->Create(); this->Create();
#if defined(WINCE_WITHOUT_COMMANDAR)
// No idea why this was here, but it seems to be obsolete.
// Remove after testing with other WinCE combinations - April 2004
#if 0
if (GetToolBar())
{
HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
if (!CommandBar_InsertMenubarEx(hCommandBar, NULL, (LPTSTR) m_hMenu, 0))
{
wxLogLastError(wxT("CommandBar_InsertMenubarEx"));
}
}
#endif
#else
if (!m_commandBar) if (!m_commandBar)
m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId()); m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId());
if (m_commandBar) if (m_commandBar)
@@ -1202,16 +1187,13 @@ void wxMenuBar::Attach(wxFrame *frame)
} }
} }
#endif #endif
// PSPC/WFSP
#endif
// __WXWINCE__ && _WIN32_WCE >= 400
#if wxUSE_ACCEL #if wxUSE_ACCEL
RebuildAccelTable(); RebuildAccelTable();
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
} }
#if defined(WINCE_WITH_COMMANDAR) #if defined(WINCE_WITH_COMMANDBAR)
bool wxMenuBar::AddAdornments(long style) bool wxMenuBar::AddAdornments(long style)
{ {
if (m_adornmentsAdded || !m_commandBar) if (m_adornmentsAdded || !m_commandBar)