as after recent change wxID_SEPARATOR is now -2, it is better for idMenuTitle to...

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 03ee6f9b5d3543d25d0093288b258159455e99cf..91c6e9d975be069bbc0a1a3b04e653796c569ca9 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -54,6 +54,48 @@
     #define OWNER_DRAWN_ONLY( code )
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 
     #define OWNER_DRAWN_ONLY( code )
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 

+// ----------------------------------------------------------------------------
+// static function for translating menu labels
+// ----------------------------------------------------------------------------
+
+static wxString TextToLabel(
+  const wxString&                   rsTitle
+)
+{
+    wxString                        sTitle;
+    const wxChar*                   zPc;
+
+    if (rsTitle.IsEmpty())
+        return(sTitle);
+
+    for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++)
+    {
+        if (*zPc == wxT('&'))
+        {
+            if (*(zPc + 1) == wxT('&'))
+            {
+                zPc++;
+                sTitle << wxT('&');
+            }
+            else
+                sTitle << wxT('~');
+        }
+        else
+        {
+            if ( *zPc == wxT('~'))
+            {
+                //
+                // Tildes must be doubled to prevent them from being
+                // interpreted as accelerator character prefix by PM ???
+                //
+                sTitle << *zPc;
+            }
+            sTitle << *zPc;
+        }
+    }
+    return(sTitle);
+} // end of TextToLabel
+

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


@@ -62,11 +104,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-    #if wxUSE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
-    #else   //!USE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
-    #endif  //USE_OWNER_DRAWN
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 
 // ----------------------------------------------------------------------------
 // wxMenuItem


@@ -78,25 +116,69 @@
 wxMenuItem::wxMenuItem(
   wxMenu*                           pParentMenu
 , int                               nId
 wxMenuItem::wxMenuItem(
   wxMenu*                           pParentMenu
 , int                               nId

-, const wxString&                   rText
-, const wxString&                   rStrHelp
-, bool                              bCheckable
+, const wxString&                   rsText
+, const wxString&                   rsHelp
+, wxItemKind                        eKind

 , wxMenu*                           pSubMenu
 )
 , wxMenu*                           pSubMenu
 )

+: wxMenuItemBase( pParentMenu
+                 ,nId
+                 ,TextToLabel(rsText)
+                 ,rsHelp
+                 ,eKind
+                 ,pSubMenu
+                )

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-:  wxOwnerDrawn( rText
-                ,bCheckable
+,  wxOwnerDrawn( TextToLabel(rsText)
+                ,eKind == wxITEM_CHECK

                )
 #endif // owner drawn
 {
     wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
                )
 #endif // owner drawn
 {
     wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));

+    memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
+    m_vMenuData.id = (USHORT)nId;

 
 

-#if  wxUSE_OWNER_DRAWN
+    Init();
+} // end of wxMenuItem::wxMenuItem
+
+wxMenuItem::wxMenuItem(
+  wxMenu*                           pParentMenu
+, int                               nId
+, const wxString&                   rsText
+, const wxString&                   rsHelp
+, bool                              bIsCheckable
+, wxMenu*                           pSubMenu
+)
+: wxMenuItemBase( pParentMenu
+                 ,nId
+                 ,TextToLabel(rsText)
+                 ,rsHelp
+                 ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
+                 ,pSubMenu
+                )
+#if wxUSE_OWNER_DRAWN
+,  wxOwnerDrawn( TextToLabel(rsText)
+                ,bIsCheckable
+               )
+#endif // owner drawn
+{
+    wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent"));
+    memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
+    m_vMenuData.id = (USHORT)nId;

 
 

+    Init();
+} // end of wxMenuItem::wxMenuItem
+
+void wxMenuItem::Init()
+{
+    m_vRadioGroup.m_nStart = -1;
+    m_bIsRadioGroupStart = FALSE;
+
+#if  wxUSE_OWNER_DRAWN

     //
     // Set default menu colors
     //
     //
     // Set default menu colors
     //

-    #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
+    #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c))

 
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));


@@ -105,19 +187,14 @@ wxMenuItem::wxMenuItem(
     // We don't want normal items be owner-drawn
     //
     ResetOwnerDrawn();
     // We don't want normal items be owner-drawn
     //
     ResetOwnerDrawn();

-

     #undef  SYS_COLOR
     #undef  SYS_COLOR

-#endif // wxUSE_OWNER_DRAWN

 
 

-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_id          = nId;
-    m_text        = rText;
-    m_isCheckable = bCheckable;
-    m_help        = rStrHelp;
-} // end of wxMenuItem::wxMenuItem
+    //
+    // Tell the owner drawing code to to show the accel string as well
+    //
+    SetAccelString(m_text.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN
+} // end of wxMenuItem::Init

 
 wxMenuItem::~wxMenuItem()
 {
 
 wxMenuItem::~wxMenuItem()
 {


@@ -150,23 +227,55 @@ bool wxMenuItem::IsChecked() const
 } // end of wxMenuItem::IsChecked
 
 wxString wxMenuItemBase::GetLabelFromText(
 } // end of wxMenuItem::IsChecked
 
 wxString wxMenuItemBase::GetLabelFromText(

-  const wxString&                   rText
+  const wxString&                   rsText

 )
 {
 )
 {

-    return wxStripMenuCodes(rText);
-}
+    wxString                        sLabel;

 
 

-// accelerators
-// ------------
+    for (const char* zPc = rsText.c_str(); *zPc; zPc++)
+    {
+        if (*zPc == wxT('~') || *zPc == wxT('&'))
+        {
+            //
+            // '~' is the escape character for OS/2PM and '&' is the one for
+            // wxWindows - skip both of them
+            //
+            continue;
+        }
+        sLabel += *zPc;
+    }
+    return sLabel;
+} // end of wxMenuItemBase::GetLabelFromText

 
 

-#if wxUSE_ACCEL
+//
+// Radio group stuff
+// -----------------
+//
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_bIsRadioGroupStart = TRUE;
+} // end of wxMenuItem::SetAsRadioGroupStart

 
 

-wxAcceleratorEntry *wxMenuItem::GetAccel() const
+void wxMenuItem::SetRadioGroupStart(
+  int                               nStart
+)

 {
 {

-    return wxGetAccelFromString(GetText());
-}
+    wxASSERT_MSG( !m_bIsRadioGroupStart
+                 ,_T("should only be called for the next radio items")
+                );

 
 

-#endif // wxUSE_ACCEL
+    m_vRadioGroup.m_nStart = nStart;
+} // wxMenuItem::SetRadioGroupStart
+
+void wxMenuItem::SetRadioGroupEnd(
+  int                               nEnd
+)
+{
+    wxASSERT_MSG( m_bIsRadioGroupStart
+                 ,_T("should only be called for the first radio item")
+                );
+    m_vRadioGroup.m_nEnd = nEnd;
+} // end of wxMenuItem::SetRadioGroupEnd

 
 // change item state
 // -----------------
 
 // change item state
 // -----------------


@@ -183,13 +292,13 @@ void wxMenuItem::Enable(
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)

-                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
+                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)

                                 );
     else
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)
                                 );
     else
         bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
                                  ,MM_SETITEMATTR
                                  ,MPFROM2SHORT(GetRealId(), TRUE)

-                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)

                                 );
     if (!bOk)
     {
                                 );
     if (!bOk)
     {


@@ -204,24 +313,98 @@ void wxMenuItem::Check(
 {
     bool                            bOk;
 
 {
     bool                            bOk;
 

-    wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") );
+    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );

     if (m_isChecked == bCheck)
         return;
     if (m_isChecked == bCheck)
         return;

-    if (bCheck)
-        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                 ,MM_SETITEMATTR
-                                 ,MPFROM2SHORT(GetRealId(), TRUE)
-                                 ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
-                                );
-    else
-        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                 ,MM_SETITEMATTR
-                                 ,MPFROM2SHORT(GetRealId(), TRUE)
-                                 ,MPFROM2SHORT(MIA_CHECKED, FALSE)
-                                );
+
+    HMENU                           hMenu = GetHmenuOf(m_parentMenu);
+
+    if (GetKind() == wxITEM_RADIO)
+    {
+        //
+        // It doesn't make sense to uncheck a radio item - what would this do?
+        //
+        if (!bCheck)
+            return;
+
+        //
+        // Get the index of this item in the menu
+        //
+        const wxMenuItemList&       rItems = m_parentMenu->GetMenuItems();
+        int                         nPos = rItems.IndexOf(this);
+
+        wxCHECK_RET( nPos != wxNOT_FOUND
+                    ,_T("menuitem not found in the menu items list?")
+                   );
+
+        //
+        // Get the radio group range
+        //
+        int                         nStart;
+        int                         nEnd;
+
+        if (m_bIsRadioGroupStart)
+        {
+            //
+            // We already have all information we need
+            //
+            nStart = nPos;
+            nEnd   = m_vRadioGroup.m_nEnd;
+        }
+        else // next radio group item
+        {
+            //
+            // Get the radio group end from the start item
+            //
+            nStart = m_vRadioGroup.m_nStart;
+            nEnd = rItems.Item(nStart)->GetData()->m_vRadioGroup.m_nEnd;
+        }
+
+        //
+        // Also uncheck all the other items in this radio group
+        //
+        wxMenuItemList::Node*       pNode = rItems.Item(nStart);
+
+        for (int n = nStart; n <= nEnd && pNode; n++)
+        {
+            if (n == nPos)
+            {
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                            );
+            }
+            if (n != nPos)
+            {
+                pNode->GetData()->m_isChecked = FALSE;
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                            );
+            }
+            pNode = pNode->GetNext();
+        }
+    }
+    else // check item
+    {
+        if (bCheck)
+            bOk = (bool)::WinSendMsg( hMenu
+                                     ,MM_SETITEMATTR
+                                     ,MPFROM2SHORT(GetRealId(), TRUE)
+                                     ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                                    );
+        else
+            bOk = (bool)::WinSendMsg( hMenu
+                                     ,MM_SETITEMATTR
+                                     ,MPFROM2SHORT(GetRealId(), TRUE)
+                                     ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                                    );
+    }

     if (!bOk)
     {
     if (!bOk)
     {

-        wxLogLastError("EnableMenuItem");
+        wxLogLastError("CheckMenuItem");

     }
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check
     }
     wxMenuItemBase::Check(bCheck);
 } // end of wxMenuItem::Check


@@ -233,13 +416,18 @@ void wxMenuItem::SetText(
     //
     // Don't do anything if label didn't change
     //
     //
     // Don't do anything if label didn't change
     //

-    if (m_text == rText)
+
+    wxString                        sText = TextToLabel(rText);
+    if (m_text == sText)

         return;
 
         return;
 

-    wxMenuItemBase::SetText(rText);
-    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(rText));
+    wxMenuItemBase::SetText(sText);
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));
+#if  wxUSE_OWNER_DRAWN
+    SetAccelString(rText.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN

 
 

-    HWND                            hMenu = GetHMenuOf(m_parentMenu);
+    HWND                            hMenu = GetHmenuOf(m_parentMenu);

 
     wxCHECK_RET(hMenu, wxT("menuitem without menu"));
 
 
     wxCHECK_RET(hMenu, wxT("menuitem without menu"));
 


@@ -279,7 +467,7 @@ void wxMenuItem::SetText(
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;

-            pData = (BYTE*)rText.c_str();
+            pData = (BYTE*)sText.c_str();

         }
 
         //
         }
 
         //


@@ -325,7 +513,7 @@ wxMenuItem* wxMenuItemBase::New(
 , int                               nId
 , const wxString&                   rName
 , const wxString&                   rHelp
 , int                               nId
 , const wxString&                   rName
 , const wxString&                   rHelp

-, bool                              bIsCheckable
+, wxItemKind                        kind

 , wxMenu*                           pSubMenu
 )
 {
 , wxMenu*                           pSubMenu
 )
 {


@@ -333,7 +521,7 @@ wxMenuItem* wxMenuItemBase::New(
                           ,nId
                           ,rName
                           ,rHelp
                           ,nId
                           ,rName
                           ,rHelp

-                          ,bIsCheckable
+                          ,kind

                           ,pSubMenu
                          );
 } // end of wxMenuItemBase::New
                           ,pSubMenu
                          );
 } // end of wxMenuItemBase::New