Correct selection/drop highlight rectangles width in generic wxDataViewCtrl.

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 1d960c605b06481777659b18c361ac97594d075d..bffbf97258f1532ab357ee686590400d35dbe4d5 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        menuitem.cpp
+// Name:        src/os2/menuitem.cpp

 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxMenuItem implementation
 // Author:      David Webster
 // Modified by:


@@ -13,27 +13,23 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "menuitem.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/menuitem.h"
+#include "wx/stockitem.h"
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"

-    #include "wx/font.h"

     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/menuitem.h"
-#include "wx/log.h"
-

 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL


@@ -54,44 +50,6 @@
     #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& 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
 // ============================================================================


@@ -100,11 +58,7 @@ static wxString TextToLabel(const wxString& rTitle)
 // 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


@@ -116,25 +70,69 @@ static wxString TextToLabel(const wxString& rTitle)
 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
+                 ,wxPMTextToLabel(rsText)
+                 ,rsHelp
+                 ,eKind
+                 ,pSubMenu
+                )

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-:  wxOwnerDrawn( TextToLabel(rText)
-                ,bCheckable
+,  wxOwnerDrawn( wxPMTextToLabel(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
+                 ,wxPMTextToLabel(rsText)
+                 ,rsHelp
+                 ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
+                 ,pSubMenu
+                )
+#if wxUSE_OWNER_DRAWN
+,  wxOwnerDrawn( wxPMTextToLabel(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));


@@ -143,21 +141,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        = TextToLabel(rText);
-    m_isCheckable = bCheckable;
-    m_help        = rStrHelp;
-    memset(&m_vMenuData, '\0', sizeof(m_vMenuData));
-    m_vMenuData.id= nId;
-} // end of wxMenuItem::wxMenuItem
+    //
+    // Tell the owner drawing code to to show the accel string as well
+    //
+    SetAccelString(m_text.AfterFirst(wxT('\t')));
+#endif // wxUSE_OWNER_DRAWN
+} // end of wxMenuItem::Init

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


@@ -180,45 +171,65 @@ int wxMenuItem::GetRealId() const
 // --------------
 bool wxMenuItem::IsChecked() const
 {
 // --------------
 bool wxMenuItem::IsChecked() const
 {

-    USHORT                          uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
-                                                                      ,MM_QUERYITEMATTR
-                                                                      ,MPFROM2SHORT(GetId(), TRUE)
-                                                                      ,MPFROMSHORT(MIA_CHECKED)
-                                                                     ));
+    USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                             ,MM_QUERYITEMATTR
+                                             ,MPFROM2SHORT(GetId(), TRUE)
+                                             ,MPFROMSHORT(MIA_CHECKED)
+                                            ));

 
 

-    return (uFlag & MIA_CHECKED);
+    return (uFlag & MIA_CHECKED) == MIA_CHECKED ;

 } // end of wxMenuItem::IsChecked
 
 } // end of wxMenuItem::IsChecked
 

-wxString wxMenuItemBase::GetLabelFromText(
-  const wxString&                   rText
+wxString wxMenuItemBase::GetLabelText(
+  const wxString&                   rsText

 )
 {
 )
 {

-    wxString label;
-    for ( const wxChar *pc = rText.c_str(); *pc; pc++ )
+    wxString                        sLabel;
+
+    for (const wxChar* zPc = rsText.c_str(); *zPc; zPc++)

     {
     {

-        if ( *pc == wxT('~') || *pc == wxT('&') )
+        if (*zPc == wxT('~') || *zPc == wxT('&'))

         {
         {

-            // '~' is the escape character for GTK+ and '&' is the one for
-            // wxWindows - skip both of them
+            //
+            // '~' is the escape character for OS/2PM and '&' is the one for
+            // wxWidgets - skip both of them
+            //

             continue;
         }
             continue;
         }

-
-        label += *pc;
+        sLabel += *zPc;

     }
     }

-    return label;
-}
+    return sLabel;
+} // end of wxMenuItemBase::GetLabelText

 
 

-// accelerators
-// ------------
-
-#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
+                 ,wxT("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
+                 ,wxT("should only be called for the first radio item")
+                );
+    m_vRadioGroup.m_nEnd = nEnd;
+} // end of wxMenuItem::SetRadioGroupEnd

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


@@ -245,7 +256,7 @@ void wxMenuItem::Enable(
                                 );
     if (!bOk)
     {
                                 );
     if (!bOk)
     {

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

     }
     wxMenuItemBase::Enable(bEnable);
 } // end of wxMenuItem::Enable
     }
     wxMenuItemBase::Enable(bEnable);
 } // end of wxMenuItem::Enable


@@ -256,44 +267,127 @@ 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
+                    ,wxT("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::compatibility_iterator node = rItems.Item(nStart);
+
+        for (int n = nStart; n <= nEnd && node; n++)
+        {
+            if (n == nPos)
+            {
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
+                            );
+            }
+            if (n != nPos)
+            {
+                node->GetData()->m_isChecked = FALSE;
+                ::WinSendMsg( hMenu
+                             ,MM_SETITEMATTR
+                             ,MPFROM2SHORT(n, TRUE)
+                             ,MPFROM2SHORT(MIA_CHECKED, FALSE)
+                            );
+            }
+            node = node->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("CheckMenuItem");
+        wxLogLastError(wxT("CheckMenuItem"));

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

-void wxMenuItem::SetText(
-  const wxString&                   rText
-)
+void wxMenuItem::SetItemLabel( const wxString& rText )

 {
     //
     // Don't do anything if label didn't change
     //
 
 {
     //
     // Don't do anything if label didn't change
     //
 

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

         return;
 
         return;
 

-    wxMenuItemBase::SetText(Text);
-    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text));
+    // wxMenuItemBase will do stock ID checks
+    wxMenuItemBase::SetItemLabel(sText);

 
 

-    HWND                            hMenu = GetHMenuOf(m_parentMenu);
+    // m_text could now be different from 'text' if we are a stock menu item,
+    // so use only m_text below
+
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text));
+#if  wxUSE_OWNER_DRAWN
+    if (rText.IsEmpty())
+        SetAccelString(m_text.AfterFirst(wxT('\t')));
+    else
+        SetAccelString(rText.AfterFirst(wxT('\t')));
+#endif // wxUSE_OWNER_DRAWN
+
+    HWND                            hMenu = GetHmenuOf(m_parentMenu);

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


@@ -301,9 +395,9 @@ void wxMenuItem::SetText(
     m_parentMenu->UpdateAccel(this);
 #endif // wxUSE_ACCEL
 
     m_parentMenu->UpdateAccel(this);
 #endif // wxUSE_ACCEL
 

-    USHORT                          uId = GetRealId();
-    MENUITEM                        vItem;
-    USHORT                          uFlagsOld;
+    USHORT   uId = (USHORT)GetRealId();
+    MENUITEM vItem;
+    USHORT   uFlagsOld;

 
     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM
 
     if (!::WinSendMsg( hMenu
                       ,MM_QUERYITEM


@@ -311,7 +405,7 @@ void wxMenuItem::SetText(
                       ,(MPARAM)&vItem
                      ))
     {
                       ,(MPARAM)&vItem
                      ))
     {

-        wxLogLastError("GetMenuState");
+        wxLogLastError(wxT("GetMenuState"));

     }
     else
     {
     }
     else
     {


@@ -321,19 +415,19 @@ void wxMenuItem::SetText(
             uFlagsOld |= MIS_SUBMENU;
         }
 
             uFlagsOld |= MIS_SUBMENU;
         }
 

-        BYTE*                       pData;
+        char*                       pData;

 
 #if wxUSE_OWNER_DRAWN
         if (IsOwnerDrawn())
         {
             uFlagsOld |= MIS_OWNERDRAW;
 
 #if wxUSE_OWNER_DRAWN
         if (IsOwnerDrawn())
         {
             uFlagsOld |= MIS_OWNERDRAW;

-            pData = (BYTE*)this;
+            pData = (char*)this;

         }
         else
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;
         }
         else
 #endif  //owner drawn
         {
             uFlagsOld |= MIS_TEXT;

-            pData = (BYTE*)Text.c_str();
+            pData = (char*) m_text.wx_str();

         }
 
         //
         }
 
         //


@@ -379,7 +473,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
 )
 {


@@ -387,8 +481,7 @@ wxMenuItem* wxMenuItemBase::New(
                           ,nId
                           ,rName
                           ,rHelp
                           ,nId
                           ,rName
                           ,rHelp

-                          ,bIsCheckable
+                          ,kind

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

-