attempt to fix compilation for old imagehlp.h header

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 822bd0bfd62e7bcaf770bd89c35ad75c5a7a89ff..e8f1c41df9358e453a786f7b6c756e10dd05f65c 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -6,7 +6,7 @@
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MENUS
+

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


@@ -42,8 +44,17 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

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

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

+#ifdef __WXWINCE__
+// Implemented in menu.cpp
+UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ;
+#endif
+

 // ---------------------------------------------------------------------------
 // macro
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // macro
 // ---------------------------------------------------------------------------


@@ -66,13 +77,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

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

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


@@ -85,35 +90,51 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        int id,
                        const wxString& text,
                        const wxString& strHelp,
                        int id,
                        const wxString& text,
                        const wxString& strHelp,

-                       bool bCheckable,
-                       wxMenu *pSubMenu) :
+                       wxItemKind kind,
+                       wxMenu *pSubMenu)
+          : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-                        wxOwnerDrawn(text, bCheckable)
+            , wxOwnerDrawn(text, kind == wxITEM_CHECK)

 #endif // owner drawn
 {
 #endif // owner drawn
 {

-    wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
+    Init();
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& help,
+                       bool isCheckable,
+                       wxMenu *subMenu)
+          : wxMenuItemBase(parentMenu, id, text, help,
+                           isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
+#if wxUSE_OWNER_DRAWN
+           , wxOwnerDrawn(text, isCheckable, true)
+#endif // owner drawn
+{
+    Init();
+}
+
+void wxMenuItem::Init()
+{
+    m_radioGroup.start = -1;
+    m_isRadioGroupStart = FALSE;

 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
 
 #if  wxUSE_OWNER_DRAWN
     // 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));
 

+    #undef  SYS_COLOR
+

     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 
     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 

-    #undef  SYS_COLOR
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(m_text.AfterFirst(_T('\t')));

 #endif // wxUSE_OWNER_DRAWN
 #endif // wxUSE_OWNER_DRAWN

-
-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_id          = id;
-    m_text        = text;
-    m_isCheckable = bCheckable;
-    m_help        = strHelp;

 }
 
 wxMenuItem::~wxMenuItem()
 }
 
 wxMenuItem::~wxMenuItem()


@@ -129,14 +150,6 @@ int wxMenuItem::GetRealId() const
     return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
 }
 
     return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
 }
 

-// delete the sub menu
-// -------------------
-void wxMenuItem::DeleteSubMenu()
-{
-    delete m_subMenu;
-    m_subMenu = NULL;
-}
-

 // get item state
 // --------------
 
 // get item state
 // --------------
 


@@ -144,45 +157,144 @@ bool wxMenuItem::IsChecked() const
 {
     int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
 
 {
     int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
 

-    // don't "and" with MF_ENABLED because its value is 0
-    return (flag & MF_DISABLED) == 0;
+    return (flag & MF_CHECKED) != 0;
+}
+
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+
+// radio group stuff
+// -----------------
+
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_isRadioGroupStart = TRUE;
+}
+
+void wxMenuItem::SetRadioGroupStart(int start)
+{
+    wxASSERT_MSG( !m_isRadioGroupStart,
+                  _T("should only be called for the next radio items") );
+
+    m_radioGroup.start = start;
+}
+
+void wxMenuItem::SetRadioGroupEnd(int end)
+{
+    wxASSERT_MSG( m_isRadioGroupStart,
+                  _T("should only be called for the first radio item") );
+
+    m_radioGroup.end = end;

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

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

 {
 {

-    if ( m_isEnabled != bDoEnable ) {
-        long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
-                                 GetRealId(),
-                                 MF_BYCOMMAND |
-                                 (bDoEnable ? MF_ENABLED : MF_GRAYED));
-
-        if ( rc == -1 ) {
-            wxLogLastError("EnableMenuItem");
-        }
+    if ( m_isEnabled == enable )
+        return;
+
+    long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
+                             GetRealId(),
+                             MF_BYCOMMAND |
+                             (enable ? MF_ENABLED : MF_GRAYED));

 
 

-        wxMenuItemBase::Enable(m_isEnabled);
+    if ( rc == -1 ) {
+        wxLogLastError(wxT("EnableMenuItem"));

     }
     }

+
+    wxMenuItemBase::Enable(enable);

 }
 
 }
 

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

 {
 {

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

 
 

-    if ( m_isChecked != bDoCheck ) {
-        long rc = CheckMenuItem(GetHMenuOf(m_parentMenu),
-                                GetId(),
-                                MF_BYCOMMAND |
-                                (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
+    if ( m_isChecked == check )
+        return;
+
+    int flags = check ? MF_CHECKED : MF_UNCHECKED;
+    HMENU hmenu = GetHMenuOf(m_parentMenu);
+
+    if ( GetKind() == wxITEM_RADIO )
+    {
+        // it doesn't make sense to uncheck a radio item - what would this do?
+        if ( !check )
+            return;
+
+        // get the index of this item in the menu
+        const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+        int pos = items.IndexOf(this);
+        wxCHECK_RET( pos != wxNOT_FOUND,
+                     _T("menuitem not found in the menu items list?") );
+
+        // get the radio group range
+        int start,
+            end;
+
+        if ( m_isRadioGroupStart )
+        {
+            // we already have all information we need
+            start = pos;
+            end = m_radioGroup.end;
+        }
+        else // next radio group item
+        {
+            // get the radio group end from the start item
+            start = m_radioGroup.start;
+            end = items.Item(start)->GetData()->m_radioGroup.end;
+        }

 
 

-        if ( rc == -1 ) {
-            wxLogLastError("CheckMenuItem");
+#ifdef __WIN32__
+        // calling CheckMenuRadioItem() with such parameters hangs my system
+        // (NT4 SP6) and I suspect this could happen to the others as well - so
+        // don't do it!
+        wxCHECK_RET( start != -1 && end != -1,
+                     _T("invalid ::CheckMenuRadioItem() parameter(s)") );
+
+        if ( !::CheckMenuRadioItem(hmenu,
+                                   start,   // the first radio group item
+                                   end,     // the last one
+                                   pos,     // the one to check
+                                   MF_BYPOSITION) )
+        {
+            wxLogLastError(_T("CheckMenuRadioItem"));

         }
         }

+#endif // __WIN32__

 
 

-        wxMenuItemBase::Check(m_isChecked);
+        // also uncheck all the other items in this radio group
+        wxMenuItemList::compatibility_iterator node = items.Item(start);
+        for ( int n = start; n <= end && node; n++ )
+        {
+            if ( n != pos )
+            {
+                node->GetData()->m_isChecked = FALSE;
+            }
+
+            // we also have to do it in the menu for Win16 (under Win32
+            // CheckMenuRadioItem() does it for us)
+#ifndef __WIN32__
+            ::CheckMenuItem(hmenu, n, n == pos ? MF_CHECKED : MF_UNCHECKED);
+#endif // Win16
+
+            node = node->GetNext();
+        }
+    }
+    else // check item
+    {
+        if ( ::CheckMenuItem(hmenu,
+                             GetRealId(),
+                             MF_BYCOMMAND | flags) == (DWORD)-1 )
+        {
+            wxLogLastError(wxT("CheckMenuItem"));
+        }

     }
     }

+
+    wxMenuItemBase::Check(check);

 }
 
 void wxMenuItem::SetText(const wxString& text)
 }
 
 void wxMenuItem::SetText(const wxString& text)


@@ -193,14 +305,23 @@ void wxMenuItem::SetText(const wxString& text)
 
     wxMenuItemBase::SetText(text);
     OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
 
     wxMenuItemBase::SetText(text);
     OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );

+#if wxUSE_OWNER_DRAWN
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(text.AfterFirst(_T('\t')));
+#endif

 
     HMENU hMenu = GetHMenuOf(m_parentMenu);
 
     HMENU hMenu = GetHMenuOf(m_parentMenu);

+    wxCHECK_RET( hMenu, wxT("menuitem without menu") );
+
+#if wxUSE_ACCEL
+    m_parentMenu->UpdateAccel(this);
+#endif // wxUSE_ACCEL

 
     UINT id = GetRealId();
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {
 
     UINT id = GetRealId();
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {

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

     }
     else
     {
     }
     else
     {


@@ -223,15 +344,34 @@ void wxMenuItem::SetText(const wxString& text)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;

-            data = (char*) text.c_str();
+            data = (wxChar*) text.c_str();

         }
 
         }
 

+#ifdef __WXWINCE__
+        // FIXME: complete this, applying the old
+        // flags.
+        // However, the WinCE doc for SetMenuItemInfo
+        // says that you can't use it to set the menu
+        // item state; only data, id and type.
+        MENUITEMINFO info;
+        wxZeroMemory(info);
+        info.cbSize = sizeof(info);
+        info.fMask = MIIM_TYPE;
+        info.fType = MFT_STRING;
+        info.cch = text.Length();
+        info.dwTypeData = (LPTSTR) data ;
+        if ( !SetMenuItemInfo(hMenu, id, FALSE, & info) )
+        {
+            wxLogLastError(wxT("SetMenuItemInfo"));
+        }
+#else

         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,
                           id, data) == (int)0xFFFFFFFF )
         {
             wxLogLastError(wxT("ModifyMenu"));
         }
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,
                           id, data) == (int)0xFFFFFFFF )
         {
             wxLogLastError(wxT("ModifyMenu"));
         }

+#endif

     }
 }
 
     }
 }
 


@@ -249,8 +389,10 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,

-                                bool isCheckable,
+                                wxItemKind kind,

                                 wxMenu *subMenu)
 {
                                 wxMenu *subMenu)
 {

-    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);

 }
 }

+
+#endif // wxUSE_MENUS