really correct detecting the end of UTF-7-encoded strings

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 3f8db0640b83172ee1b5fd336267d19f2a2dbff3..7dc55b2412c21596543fed1546e0fd637507834b 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -201,7 +201,7 @@ void wxMenu::UpdateAccel(
         //
         // Find the (new) accel for this item
         //
         //
         // Find the (new) accel for this item
         //

-        wxAcceleratorEntry*         pAccel = wxGetAccelFromString(pItem->GetText());
+        wxAcceleratorEntry*         pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel());

 
         if (pAccel)
             pAccel->m_command = pItem->GetId();
 
         if (pAccel)
             pAccel->m_command = pItem->GetId();


@@ -287,7 +287,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
         rItem.id = (USHORT)pItem->GetId();
     }
 
         rItem.id = (USHORT)pItem->GetId();
     }
 

-    BYTE*                           pData=NULL;
+    char *pData = NULL;

 
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())
 
 #if wxUSE_OWNER_DRAWN
     if (pItem->IsOwnerDrawn())


@@ -298,7 +298,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
         // Will eventually need to set the image handle somewhere into vItem.hItem
         //
         rItem.afStyle             |= MIS_OWNERDRAW;
         // Will eventually need to set the image handle somewhere into vItem.hItem
         //
         rItem.afStyle             |= MIS_OWNERDRAW;

-        pData                      = (BYTE*)NULL;
+        pData                      = NULL;

         rItem.hItem                = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
         pItem->m_vMenuData.afStyle = rItem.afStyle;
         pItem->m_vMenuData.hItem   = rItem.hItem;
         rItem.hItem                = (HBITMAP)pItem->GetBitmap().GetHBITMAP();
         pItem->m_vMenuData.afStyle = rItem.afStyle;
         pItem->m_vMenuData.hItem   = rItem.hItem;


@@ -323,7 +323,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
             //
             rItem.afStyle |= MIS_TEXT;
         }
             //
             rItem.afStyle |= MIS_TEXT;
         }

-        pData = (char*)pItem->GetText().c_str();
+        pData = (char*) pItem->GetItemLabel().wx_str();

     }
 
     if (nPos == (size_t)-1)
     }
 
     if (nPos == (size_t)-1)


@@ -562,7 +562,7 @@ void wxMenu::SetTitle( const wxString& rLabel )
     {
         if (!rLabel.empty())
         {
     {
         if (!rLabel.empty())
         {

-            if (!::WinSetWindowText(hMenu, (PSZ)rLabel.c_str()))
+            if (!::WinSetWindowText(hMenu, rLabel.c_str()))

             {
                 wxLogLastError(wxT("SetMenuTitle"));
             }
             {
                 wxLogLastError(wxT("SetMenuTitle"));
             }


@@ -583,7 +583,7 @@ void wxMenu::SetTitle( const wxString& rLabel )
             //
             // Modify the title
             //
             //
             // Modify the title
             //

-            if (!::WinSetWindowText(hMenu, (PSZ)rLabel.c_str()))
+            if (!::WinSetWindowText(hMenu, rLabel.c_str()))

             {
                 wxLogLastError(wxT("SetMenuTitle"));
             }
             {
                 wxLogLastError(wxT("SetMenuTitle"));
             }


@@ -756,7 +756,7 @@ WXHMENU wxMenuBar::Create()
     //
     if ((m_hMenu =  ::WinCreateWindow( hFrame
                                       ,WC_MENU
     //
     if ((m_hMenu =  ::WinCreateWindow( hFrame
                                       ,WC_MENU

-                                      ,(PSZ)NULL
+                                      ,NULL

                                       ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
                                       ,0L
                                       ,0L
                                       ,MS_ACTIONBAR | WS_SYNCPAINT | WS_VISIBLE
                                       ,0L
                                       ,0L


@@ -804,7 +804,7 @@ WXHMENU wxMenuBar::Create()
 
             (*it)->m_vMenuData.iPosition = (SHORT)i;
 
 
             (*it)->m_vMenuData.iPosition = (SHORT)i;
 

-            rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].c_str());
+            rc = (APIRET)::WinSendMsg(m_hMenu, MM_INSERTITEM, (MPARAM)&(*it)->m_vMenuData, (MPARAM)m_titles[i].wx_str());

             if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
             {
                 vError = ::WinGetLastError(vHabmain);
             if (rc == (APIRET)MIT_MEMERROR || rc == (APIRET)MIT_ERROR)
             {
                 vError = ::WinGetLastError(vHabmain);


@@ -847,7 +847,7 @@ void wxMenuBar::EnableTop(
     Refresh();
 } // end of wxMenuBar::EnableTop
 
     Refresh();
 } // end of wxMenuBar::EnableTop
 

-void wxMenuBar::SetLabelTop(
+void wxMenuBar::SetMenuLabel(

   size_t                            nPos
 , const wxString&                   rLabel
 )
   size_t                            nPos
 , const wxString&                   rLabel
 )


@@ -879,21 +879,21 @@ void wxMenuBar::SetLabelTop(
     }
     nId = vItem.id;
 
     }
     nId = vItem.id;
 

-    if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.c_str()));
+    if (::WinSendMsg(GetHmenu(), MM_SETITEMTEXT, MPFROMSHORT(nId), (MPARAM)rLabel.wx_str()));

     {
         wxLogLastError(wxT("ModifyMenu"));
     }
     Refresh();
     {
         wxLogLastError(wxT("ModifyMenu"));
     }
     Refresh();

-} // end of wxMenuBar::SetLabelTop
+} // end of wxMenuBar::SetMenuLabel

 
 

-wxString wxMenuBar::GetLabelTop(
+wxString wxMenuBar::GetMenuLabel(

   size_t                            nPos
 ) const
 {
     wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,
   size_t                            nPos
 ) const
 {
     wxCHECK_MSG( nPos < GetMenuCount(), wxEmptyString,

-                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+                 wxT("invalid menu index in wxMenuBar::GetMenuLabel") );

     return m_titles[nPos];
     return m_titles[nPos];

-} // end of wxMenuBar::GetLabelTop
+} // end of wxMenuBar::GetMenuLabel

 
 // ---------------------------------------------------------------------------
 // wxMenuBar construction
 
 // ---------------------------------------------------------------------------
 // wxMenuBar construction


@@ -925,7 +925,7 @@ wxMenu* wxMenuBar::Replace(
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_REMOVEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);

-        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());

 
 #if wxUSE_ACCEL
         if (pMenuOld->HasAccels() || pMenu->HasAccels())
 
 #if wxUSE_ACCEL
         if (pMenuOld->HasAccels() || pMenu->HasAccels())


@@ -958,7 +958,7 @@ bool wxMenuBar::Insert( size_t          nPos,
         ::WinSendMsg( (HWND)m_hMenu
                      ,MM_INSERTITEM
                      ,(MPARAM)&pMenu->m_vMenuData
         ::WinSendMsg( (HWND)m_hMenu
                      ,MM_INSERTITEM
                      ,(MPARAM)&pMenu->m_vMenuData

-                     ,(MPARAM)sTitle.c_str()
+                     ,(MPARAM)sTitle.wx_str()

                     );
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())
                     );
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())


@@ -990,7 +990,7 @@ bool wxMenuBar::Append( wxMenu* pMenu,
     if ( IsAttached() )
     {
         pMenu->m_vMenuData.iPosition = MIT_END;
     if ( IsAttached() )
     {
         pMenu->m_vMenuData.iPosition = MIT_END;

-        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.c_str());
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)sTitle.wx_str());

 #if wxUSE_ACCEL
         if (pMenu->HasAccels())
         {
 #if wxUSE_ACCEL
         if (pMenu->HasAccels())
         {