Better sorting example and better default

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 1c1353c5580accf5395297f219d5dfad9fa127eb..921cfd2cbe4c633f6ce423185c3427aabb62b286 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:


@@ -16,29 +16,40 @@
 // 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/ownerdrw.h"
-#include "wx/menuitem.h"
-#include "wx/log.h"
+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL

 
 #include "wx/os2/private.h"
 
 // ---------------------------------------------------------------------------
 
 #include "wx/os2/private.h"
 
 // ---------------------------------------------------------------------------

-// convenience macro
+// macro

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

+// hide the ugly cast

 #define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())
 
 #define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())
 

+// conditional compilation
+#if wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code
+#else // !wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code )
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+

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


@@ -47,14 +58,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

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

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


@@ -63,153 +67,421 @@
 // ctor & dtor
 // -----------
 
 // ctor & dtor
 // -----------
 

-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxString& strName, const wxString& strHelp,
-                       bool bCheckable,
-                       wxMenu *pSubMenu) :
+wxMenuItem::wxMenuItem(
+  wxMenu*                           pParentMenu
+, int                               nId
+, const wxString&                   rsText
+, const wxString&                   rsHelp
+, wxItemKind                        eKind
+, wxMenu*                           pSubMenu
+)
+: wxMenuItemBase( pParentMenu
+                 ,nId
+                 ,wxPMTextToLabel(rsText)
+                 ,rsHelp
+                 ,eKind
+                 ,pSubMenu
+                )

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-                        wxOwnerDrawn(strName, bCheckable),
-#else   //no owner drawn support
-                        m_bCheckable(bCheckable),
-                        m_strName(strName),
-#endif  //owner drawn
-                        m_strHelp(strHelp)
+,  wxOwnerDrawn( wxPMTextToLabel(rsText)
+                ,eKind == wxITEM_CHECK
+               )
+#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
+
+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()

 {
 {

-    wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
+    m_vRadioGroup.m_nStart = -1;
+    m_bIsRadioGroupStart = FALSE;

 
 #if  wxUSE_OWNER_DRAWN
 
 #if  wxUSE_OWNER_DRAWN

-    // set default menu colors
-    #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
+    //
+    // Set default menu colors
+    //
+    #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));
 

-    // we don't want normal items be owner-drawn
+    //
+    // We don't want normal items be owner-drawn
+    //

     ResetOwnerDrawn();
     ResetOwnerDrawn();

-

     #undef  SYS_COLOR
     #undef  SYS_COLOR

-#endif

 
 

-    m_pParentMenu = pParentMenu;
-    m_pSubMenu    = pSubMenu;
-    m_bEnabled    = TRUE;
-    m_bChecked    = FALSE;
-    m_idItem      = id;
-}
+    //
+    // 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()
 {

-}
+} // end of wxMenuItem::~wxMenuItem

 
 

-// misc
+//
+// Misc

 // ----
 
 // ----
 

-// return the id for calling Win32 API functions
+//
+// Return the id for calling Win32 API functions
+//

 int wxMenuItem::GetRealId() const
 {
 int wxMenuItem::GetRealId() const
 {

-    return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
-}
+    return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
+} // end of wxMenuItem::GetRealId

 
 

-// delete the sub menu
-// -------------------
-void wxMenuItem::DeleteSubMenu()
+//
+// Get item state
+// --------------
+bool wxMenuItem::IsChecked() const

 {
 {

-    delete m_pSubMenu;
-    m_pSubMenu = NULL;
-}
+    USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                             ,MM_QUERYITEMATTR
+                                             ,MPFROM2SHORT(GetId(), TRUE)
+                                             ,MPFROMSHORT(MIA_CHECKED)
+                                            ));
+
+    return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
+} // end of wxMenuItem::IsChecked
+
+wxString wxMenuItemBase::GetLabelFromText(
+  const wxString&                   rsText
+)
+{
+    wxString                        sLabel;
+
+    for (const wxChar* zPc = rsText.c_str(); *zPc; zPc++)
+    {
+        if (*zPc == wxT('~') || *zPc == wxT('&'))
+        {
+            //
+            // '~' is the escape character for OS/2PM and '&' is the one for
+            // wxWidgets - skip both of them
+            //
+            continue;
+        }
+        sLabel += *zPc;
+    }
+    return sLabel;
+} // end of wxMenuItemBase::GetLabelFromText
+
+//
+// Radio group stuff
+// -----------------
+//
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_bIsRadioGroupStart = true;
+} // end of wxMenuItem::SetAsRadioGroupStart
+
+void wxMenuItem::SetRadioGroupStart(
+  int                               nStart
+)
+{
+    wxASSERT_MSG( !m_bIsRadioGroupStart
+                 ,_T("should only be called for the next radio items")
+                );
+
+    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
 // -----------------
 

-void wxMenuItem::Enable(bool bDoEnable)
+void wxMenuItem::Enable(
+  bool                              bEnable
+)

 {
 {

-    // TODO:
-/*
-    if ( m_bEnabled != bDoEnable ) {
-        long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
-                                 GetRealId(),
-                                 MF_BYCOMMAND |
-                                 (bDoEnable ? MF_ENABLED : MF_GRAYED));
-
-        if ( rc == -1 ) {
-            wxLogLastError("EnableMenuItem");
-        }
+    bool                            bOk;

 
 

-        m_bEnabled = bDoEnable;
+    if (m_isEnabled == bEnable)
+        return;
+    if (bEnable)
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, FALSE)
+                                );
+    else
+        bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+                                 ,MM_SETITEMATTR
+                                 ,MPFROM2SHORT(GetRealId(), TRUE)
+                                 ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
+                                );
+    if (!bOk)
+    {
+        wxLogLastError(wxT("EnableMenuItem"));

     }
     }

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

 
 

-void wxMenuItem::Check(bool bDoCheck)
+void wxMenuItem::Check(
+  bool                              bCheck
+)

 {
 {

+    bool                            bOk;
+

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

+    if (m_isChecked == bCheck)
+        return;

 
 

-    // TODO:
-/*
-    if ( m_bChecked != bDoCheck ) {
-        long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
-                                GetId(),
-                                MF_BYCOMMAND |
-                                (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
+    HMENU                           hMenu = GetHmenuOf(m_parentMenu);

 
 

-        if ( rc == -1 ) {
-            wxLogLastError("CheckMenuItem");
+    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;

         }
 
         }
 

-        m_bChecked = bDoCheck;
+        //
+        // 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)
+    {
+        wxLogLastError(wxT("CheckMenuItem"));
+    }
+    wxMenuItemBase::Check(bCheck);
+} // end of wxMenuItem::Check

 
 

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

 {
 {

-    // don't do anything if label didn't change
-    if ( m_strName == strName )
+    //
+    // Don't do anything if label didn't change
+    //
+
+    wxString                        sText = wxPMTextToLabel(rText);
+    if (m_text == sText)

         return;
 
         return;
 

-    m_strName = strName;
+    // wxMenuItemBase will do stock ID checks
+    wxMenuItemBase::SetText(sText);

 
 

-    HMENU hMenu = GetHMenuOf(m_pParentMenu);
+    // m_text could now be different from 'text' if we are a stock menu item,
+    // so use only m_text below

 
 

-    UINT id = GetRealId();
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text));
+#if  wxUSE_OWNER_DRAWN
+    if (rText.IsEmpty())
+        SetAccelString(m_text.AfterFirst(_T('\t')));
+    else
+        SetAccelString(rText.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN
+
+    HWND                            hMenu = GetHmenuOf(m_parentMenu);
+
+    wxCHECK_RET(hMenu, wxT("menuitem without menu"));
+
+#if wxUSE_ACCEL
+    m_parentMenu->UpdateAccel(this);
+#endif // wxUSE_ACCEL

 
 

-    // TODO:
-/*
-    UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
-    if ( flagsOld == 0xFFFFFFFF )
+    USHORT   uId = (USHORT)GetRealId();
+    MENUITEM vItem;
+    USHORT   uFlagsOld;
+
+    if (!::WinSendMsg( hMenu
+                      ,MM_QUERYITEM
+                      ,MPFROM2SHORT(uId, TRUE)
+                      ,(MPARAM)&vItem
+                     ))

     {
     {

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

     }
     else
     {
     }
     else
     {

-        if ( IsSubMenu() )
+        uFlagsOld = vItem.afStyle;
+        if (IsSubMenu())

         {
         {

-            // high byte contains the number of items in a submenu for submenus
-            flagsOld &= 0xFF;
-            flagsOld |= MF_POPUP;
+            uFlagsOld |= MIS_SUBMENU;

         }
 
         }
 

-        LPCTSTR data;
+        char*                       pData;
+

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-        if ( IsOwnerDrawn() )
+        if (IsOwnerDrawn())

         {
         {

-            flagsOld |= MF_OWNERDRAW;
-            data = (LPCTSTR)this;
+            uFlagsOld |= MIS_OWNERDRAW;
+            pData = (char*)this;

         }
         else
 #endif  //owner drawn
         {
         }
         else
 #endif  //owner drawn
         {

-            flagsOld |= MF_STRING;
-            data = strName;
+            uFlagsOld |= MIS_TEXT;
+            pData = (char*) m_text.wx_str();
+        }
+
+        //
+        // Set the style
+        //
+        if (!::WinSendMsg( hMenu
+                          ,MM_SETITEM
+                          ,MPFROM2SHORT(uId, TRUE)
+                          ,(MPARAM)&vItem
+                         ))
+        {
+            wxLogLastError(wxT("ModifyMenu"));

         }
 
         }
 

-        if ( ::ModifyMenu(hMenu, id,
-                          MF_BYCOMMAND | flagsOld,
-                          id, data) == 0xFFFFFFFF )
+        //
+        // Set the text
+        //
+        if (::WinSendMsg( hMenu
+                         ,MM_SETITEMTEXT
+                         ,MPFROMSHORT(uId)
+                         ,(MPARAM)pData
+                        ))

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

-*/
-}
+} // end of wxMenuItem::SetText
+
+void wxMenuItem::SetCheckable(
+  bool                              bCheckable
+)
+{
+    wxMenuItemBase::SetCheckable(bCheckable);
+    OWNER_DRAWN_ONLY(wxOwnerDrawn::SetCheckable(bCheckable));
+} // end of wxMenuItem::SetCheckable

 
 

+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------
+
+wxMenuItem* wxMenuItemBase::New(
+  wxMenu*                           pParentMenu
+, int                               nId
+, const wxString&                   rName
+, const wxString&                   rHelp
+, wxItemKind                        kind
+, wxMenu*                           pSubMenu
+)
+{
+    return new wxMenuItem( pParentMenu
+                          ,nId
+                          ,rName
+                          ,rHelp
+                          ,kind
+                          ,pSubMenu
+                         );
+} // end of wxMenuItemBase::New