added conversion routines to CIconHandle, removing pre 8.6 routines

[wxWidgets.git] / src / os2 / menu.cpp

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index e93d89adc4053be542bcb81d4aa1cab4a81dde02..971cff759bad08895d762a46abd45e58b1654476 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -73,7 +73,7 @@ static wxString TextToLabel(const wxString& rTitle)
 {
     wxString Title;
     const wxChar *pc;
 {
     wxString Title;
     const wxChar *pc;

-    for (pc = rTitle; *pc != wxT('\0'); pc++ )
+    for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ )

     {
         if (*pc == wxT('&') )
         {
     {
         if (*pc == wxT('&') )
         {


@@ -85,10 +85,6 @@ static wxString TextToLabel(const wxString& rTitle)
             else
                 Title << wxT('~');
         }
             else
                 Title << wxT('~');
         }

-//         else if (*pc == wxT('/'))
-//         {
-//             Title << wxT('\\');
-//         }

         else
         {
             if ( *pc == wxT('~') )
         else
         {
             if ( *pc == wxT('~') )


@@ -244,7 +240,7 @@ void wxMenu::UpdateAccel(
         if (pAccel)
             m_vAccels[n] = pAccel;
         else
         if (pAccel)
             m_vAccels[n] = pAccel;
         else

-            m_vAccels.Remove(n);
+            m_vAccels.RemoveAt(n);

     }
 
     if (IsAttached())
     }
 
     if (IsAttached())


@@ -448,7 +444,7 @@ wxMenuItem* wxMenu::DoRemove(
     if (n != wxNOT_FOUND)
     {
         delete m_vAccels[n];
     if (n != wxNOT_FOUND)
     {
         delete m_vAccels[n];

-        m_vAccels.Remove(n);
+        m_vAccels.RemoveAt(n);

     }
 
 #endif // wxUSE_ACCEL
     }
 
 #endif // wxUSE_ACCEL


@@ -609,7 +605,12 @@ wxMenuItem* wxMenu::FindItem(
         }
         else if ( pItem->IsSubMenu() )
         {
         }
         else if ( pItem->IsSubMenu() )
         {

-            pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu);
+            pItem = pItem->GetSubMenu()->FindItem( nItemId
+                                                  ,hItem
+                                                  ,ppItemMenu
+                                                 );
+            if (pItem)
+                break;

         }
         else
         {
         }
         else
         {


@@ -929,7 +930,6 @@ bool wxMenuBar::Append(
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 

-    pMenu->Attach(this);

     m_titles.Add(Title);
 
     if ( IsAttached() )
     m_titles.Add(Title);
 
     if ( IsAttached() )