Highly experimental, unstable code (for determining the

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 8ff449298fbe16a47a29ad05915dcbe3eac60995..3d9755066cd21e22d6f6fc5aa574abfc6e5cf7de 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -17,6 +17,7 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/utils.h"


@@ -55,6 +56,44 @@ static const int                    idMenuTitle = -2;
     IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 
     IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 

+// ----------------------------------------------------------------------------
+// static function for translating menu labels
+// ----------------------------------------------------------------------------
+
+static wxString TextToLabel(const wxString& rTitle)
+{
+    wxString Title;
+    const wxChar *pc;
+    for (pc = rTitle; *pc != wxT('\0'); pc++ )
+    {
+        if (*pc == wxT('&') )
+        {
+            if (*(pc+1) == wxT('&'))
+            {
+                pc++;
+                Title << wxT('&');
+            }
+            else 
+                Title << wxT('~');
+        }
+//         else if (*pc == wxT('/'))
+//         {
+//             Title << wxT('\\');
+//         }
+        else
+        {
+            if ( *pc == wxT('~') )
+            {
+                // tildes must be doubled to prevent them from being
+                // interpreted as accelerator character prefix by PM ???
+                Title << *pc;
+            }
+            Title << *pc;
+        }
+    }
+    return Title;
+}
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -86,10 +125,16 @@ void wxMenu::Init()
                                       ,0L
                                       ,NULL
                                       ,NULL
                                       ,0L
                                       ,NULL
                                       ,NULL

-                                     )) != 0)
+                                     )) == 0)

     {
         wxLogLastError("WinLoadMenu");
     }
     {
         wxLogLastError("WinLoadMenu");
     }

+    m_vMenuData.iPosition   = 0;
+    m_vMenuData.afStyle     = MIS_SUBMENU | MIS_TEXT;
+    m_vMenuData.afAttribute = (USHORT)0;
+    m_vMenuData.id          = (USHORT)0;
+    m_vMenuData.hwndSubMenu = m_hMenu;
+    m_vMenuData.hItem       = NULLHANDLE;

 
     //
     // If we have a title, insert it in the beginning of the menu
 
     //
     // If we have a title, insert it in the beginning of the menu


@@ -207,28 +252,40 @@ bool wxMenu::DoInsertOrAppend(
 , size_t                            nPos
 )
 {
 , size_t                            nPos
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;
+    MENUITEM                        vItem;
+

 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 
 #if wxUSE_ACCEL
     UpdateAccel(pItem);
 #endif // wxUSE_ACCEL
 

+    memset(&vItem, '\0', sizeof(vItem));
+

     //
     // If "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
     //
     if (m_bDoBreak)
     {
     //
     // If "Break" has just been called, insert a menu break before this item
     // (and don't forget to reset the flag)
     //
     if (m_bDoBreak)
     {

-        m_vMenuData.afStyle |= MIS_BREAK;
+        vItem.afStyle |= MIS_BREAK;

         m_bDoBreak = FALSE;
     }
 
         m_bDoBreak = FALSE;
     }
 

+    //
+    // Menu items that are being inserted into a submenu MUST have a
+    // MENUITEM structure separate from the parent menu so we must use
+    // a local vItem not the object's m_vMenuItem as that is the MENUITEM
+    // associated with the parent submenu.
+    //

     if (pItem->IsSeparator())
     {
     if (pItem->IsSeparator())
     {

-        m_vMenuData.afStyle |= MIS_SEPARATOR;
+        vItem.afStyle |= MIS_SEPARATOR;

     }
 
     //
     // Id is the numeric id for normal menu items and HMENU for submenus as
     }
 
     //
     // Id is the numeric id for normal menu items and HMENU for submenus as

-    // required by ::WinInsertMenu() API
+    // required by ::MM_INSERTITEM message API

     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();
     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();


@@ -238,13 +295,13 @@ bool wxMenu::DoInsertOrAppend(
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 

-        m_vMenuData.iPosition = 0; // submenus have a 0 position
-        m_vMenuData.id = (USHORT)pSubmenu->GetHMenu();
-        m_vMenuData.afStyle |= MIS_SUBMENU;
+        vItem.iPosition = 0; // submenus have a 0 position
+        vItem.id = (USHORT)pSubmenu->GetHMenu();
+        vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;

     }
     else
     {
     }
     else
     {

-        m_vMenuData.id = pItem->GetId();
+        vItem.id = pItem->GetId();

     }
 
     BYTE*                           pData;
     }
 
     BYTE*                           pData;


@@ -255,10 +312,11 @@ bool wxMenu::DoInsertOrAppend(
         //
         // Want to get {Measure|Draw}Item messages?
         // item draws itself, pass pointer to it in data parameter
         //
         // Want to get {Measure|Draw}Item messages?
         // item draws itself, pass pointer to it in data parameter

-        // Will eventually need to set the image handle somewhere into m_vMenuData.hItem
+        // Will eventually need to set the image handle somewhere into vItem.hItem

         //
         //

-        m_vMenuData.afStyle |= MIS_OWNERDRAW;
+        vItem.afStyle |= MIS_OWNERDRAW;

         pData = (BYTE*)pItem;
         pData = (BYTE*)pItem;

+        // vItem.hItem = ????

     }
     else
 #endif
     }
     else
 #endif


@@ -266,46 +324,33 @@ bool wxMenu::DoInsertOrAppend(
         //
         // Menu is just a normal string (passed in data parameter)
         //
         //
         // Menu is just a normal string (passed in data parameter)
         //

-        m_vMenuData.afStyle |= MIS_TEXT;
+        vItem.afStyle |= MIS_TEXT;

         pData = (char*)pItem->GetText().c_str();
     }
 
         pData = (char*)pItem->GetText().c_str();
     }
 

-    BOOL                            bOk;
+    APIRET                          rc;

 
 

-    //
-    // -1 means this is a sub menu not a menuitem.  We must create a window for it.
-    // Submenus are also attached to a menubar so its parent and owner should be the handle of the menubar.
-    //
-    if (nPos == (size_t)-1)
+    if (pSubmenu == NULL)

     {
     {

-        HWND                        hSubMenu = ::WinCreateWindow( GetWinHwnd(m_menuBar) // parent
-                                                                 ,WC_MENU               // type
-                                                                 ,"Menu"                // a generic name
-                                                                 ,0L                    // no style flag
-                                                                 ,0L,0L,0L,0L           // no position
-                                                                 ,GetWinHwnd(m_menuBar) // no owner
-                                                                 ,HWND_TOP              // always on top
-                                                                 ,0L                    // no ID needed for dynamic creation
-                                                                 ,NULL                  // no control data
-                                                                 ,NULL                  // no presentation params
-                                                                );
-
-        m_vMenuData.iPosition   = 0;
-        m_vMenuData.hwndSubMenu = hSubMenu;
-        m_vMenuData.hItem       = NULLHANDLE;
-
-        bOk = (bool)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&m_vMenuData, (MPARAM)pItem->GetText().c_str());
-    }
-    else
-    {
-        m_vMenuData.iPosition   = nPos;
-        m_vMenuData.hwndSubMenu = NULLHANDLE;
-        m_vMenuData.hItem       = NULLHANDLE;
-        bOk = (bool)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&m_vMenuData, (MPARAM)pItem->GetText().c_str());
+        //
+        // -1 means append at end
+        //
+        if (nPos == (size_t)-1)
+        {
+            vItem.iPosition = MIT_END;
+        }
+        else
+        {
+            vItem.iPosition = nPos;
+        }

     }
 
     }
 

-    if (!bOk)
+    rc = (APIRET)::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)pData);
+    if (rc == MIT_MEMERROR || rc == MIT_ERROR)

     {
     {

+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);

         wxLogLastError("Insert or AppendMenu");
         return FALSE;
     }
         wxLogLastError("Insert or AppendMenu");
         return FALSE;
     }


@@ -620,6 +665,7 @@ WXHMENU wxMenuBar::Create()
 {
     MENUITEM                        vItem;
     HWND                            hFrame;
 {
     MENUITEM                        vItem;
     HWND                            hFrame;

+    HWND                            hMenuBar = NULLHANDLE;

 
     if (m_hMenu != 0 )
         return m_hMenu;
 
     if (m_hMenu != 0 )
         return m_hMenu;


@@ -657,19 +703,44 @@ WXHMENU wxMenuBar::Create()
     {
         size_t                      nCount = GetMenuCount();
 
     {
         size_t                      nCount = GetMenuCount();
 

+        hMenuBar = GetHwnd();

         for (size_t i = 0; i < nCount; i++)
         {
         for (size_t i = 0; i < nCount; i++)
         {

-            vItem.iPosition   = 0;
-            vItem.afStyle     = MIS_SUBMENU | MIS_TEXT;
-            vItem.afAttribute = (USHORT)0;
-            vItem.id          = (USHORT)0;
-            vItem.hwndSubMenu = m_menus[i]->GetHMenu();
-            vItem.hItem       = NULLHANDLE;
-
-            ::WinSendMsg(GetHmenu(), MM_INSERTITEM, (MPARAM)&vItem, (MPARAM)m_titles[i].c_str());
+            APIRET                  rc;
+            ERRORID                 vError;
+            wxString                sError;
+            MENUITEM                vItem;
+
+            //
+            // Set the parent and owner of the submenues to be the menubar, not the desktop
+            //
+            if (!::WinSetParent(m_menus[i]->m_vMenuData.hwndSubMenu, hMenuBar, FALSE))
+            {
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+                return NULLHANDLE;
+            }
+
+            if (!::WinSetOwner(m_menus[i]->m_vMenuData.hwndSubMenu, hMenuBar))
+            {
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+                return NULLHANDLE;
+            }
+
+            rc = (APIRET)::WinSendMsg(hMenuBar, MM_INSERTITEM, (MPARAM)&m_menus[i]->m_vMenuData, (MPARAM)m_titles[i].c_str());
+            if (rc == MIT_MEMERROR || rc == MIT_ERROR)
+            {
+                vError = ::WinGetLastError(vHabmain);
+                sError = wxPMErrorToStr(vError);
+                wxLogError("Error inserting or appending a menuitem. Error: %s\n", sError);
+                return NULLHANDLE;
+            }

         }
     }
         }
     }

-    return m_hMenu;
+    return hMenuBar;

 } // end of wxMenuBar::Create
 
 // ---------------------------------------------------------------------------
 } // end of wxMenuBar::Create
 
 // ---------------------------------------------------------------------------


@@ -761,9 +832,10 @@ wxMenu* wxMenuBar::Replace(
 )
 {
     SHORT                            nId;
 )
 {
     SHORT                            nId;

+    wxString                         Title = TextToLabel(rTitle);

     wxMenu*                          pMenuOld = wxMenuBarBase::Replace( nPos
                                                                        ,pMenu
     wxMenu*                          pMenuOld = wxMenuBarBase::Replace( nPos
                                                                        ,pMenu

-                                                                       ,rTitle
+                                                                       ,Title

                                                                       );
 
 
                                                                       );
 
 


@@ -775,11 +847,11 @@ wxMenu* wxMenuBar::Replace(
     }
     if (!pMenuOld)
         return FALSE;
     }
     if (!pMenuOld)
         return FALSE;

-    m_titles[nPos] = rTitle;
+    m_titles[nPos] = Title;

     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);
     if (IsAttached())
     {
         ::WinSendMsg((HWND)m_hMenu, MM_DELETEITEM, MPFROM2SHORT(nId, TRUE), (MPARAM)0);

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

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


@@ -801,13 +873,14 @@ bool wxMenuBar::Insert(
 , const wxString&                   rTitle
 )
 {
 , const wxString&                   rTitle
 )
 {

+    wxString Title = TextToLabel(rTitle);

     if (!wxMenuBarBase::Insert( nPos
                                ,pMenu
     if (!wxMenuBarBase::Insert( nPos
                                ,pMenu

-                               ,rTitle
+                               ,Title

                               ))
         return FALSE;
 
                               ))
         return FALSE;
 

-    m_titles.Insert( rTitle
+    m_titles.Insert( Title

                     ,nPos
                    );
 
                     ,nPos
                    );
 


@@ -815,7 +888,7 @@ bool wxMenuBar::Insert(
 
     if (IsAttached())
     {
 
     if (IsAttached())
     {

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

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


@@ -837,16 +910,17 @@ bool wxMenuBar::Append(
 
     wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));
 
 
     wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));
 

-    if (!wxMenuBarBase::Append(pMenu, rTitle))
+    wxString Title = TextToLabel(rTitle);
+    if (!wxMenuBarBase::Append(pMenu, Title))

         return FALSE;
 
     pMenu->Attach(this);
         return FALSE;
 
     pMenu->Attach(this);

-    m_titles.Add(rTitle);
+    m_titles.Add(Title);

 
     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)rTitle.c_str());
+        ::WinSendMsg((HWND)m_hMenu, MM_INSERTITEM, (MPARAM)&pMenu->m_vMenuData, (MPARAM)Title.c_str());

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