From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 13 Jun 2004 16:11:40 +0000 (+0000)
Subject: Small WinCE symbol fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3fd239fab9d250b50bf0e1973f959cefe20fb7f8

Small WinCE symbol fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 7071a640da..21fa9db8b6 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -744,12 +744,12 @@ void wxMenuBar::Refresh()
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unattached menubar") );
 
-#if defined(WINCE_WITH_COMMANDBAR)
+#if defined(WINCE_WITHOUT_COMMANDBAR)
     if (GetToolBar())
     {
         CommandBar_DrawMenuBar((HWND) GetToolBar()->GetHWND(), 0);
     }
-#elif defined(WINCE_WITHOUT_COMMANDBAR)
+#elif defined(WINCE_WITH_COMMANDBAR)
     if (m_commandBar)
         DrawMenuBar((HWND) m_commandBar);
 #else
@@ -1171,24 +1171,9 @@ void wxMenuBar::Attach(wxFrame *frame)
 {
     wxMenuBarBase::Attach(frame);
 
-#if defined(__WXWINCE__)
+#if defined(WINCE_WITH_COMMANDBAR)
     if (!m_hMenu)
         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)
         m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), (HWND) frame->GetHWND(), NewControlId());
     if (m_commandBar)
@@ -1202,16 +1187,13 @@ void wxMenuBar::Attach(wxFrame *frame)
         }
     }
 #endif
-    // PSPC/WFSP
-#endif
-    // __WXWINCE__ && _WIN32_WCE >= 400
 
 #if wxUSE_ACCEL
     RebuildAccelTable();
 #endif // wxUSE_ACCEL
 }
 
-#if defined(WINCE_WITH_COMMANDAR)
+#if defined(WINCE_WITH_COMMANDBAR)
 bool wxMenuBar::AddAdornments(long style)
 {
     if (m_adornmentsAdded || !m_commandBar)