Don't send a focus event if the window is a wxTextCtrl, since it sends

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 3cde92823209a29f6352c2d65bbd1d6fbbb1ec02..c87a217ce6f8b60ec15e2c8c7e8eb647cdd48f48 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -2,32 +2,67 @@
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "menuitem.h"
+#endif

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_MENUS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/menu.h"
+    #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"

 #endif
 
 #endif
 

-#include "wx/ownerdrw.h"

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

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

 
 

-#include <windows.h>
+#include "wx/msw/private.h"
+
+// ---------------------------------------------------------------------------
+// macro
+// ---------------------------------------------------------------------------
+
+// hide the ugly cast
+#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


@@ -37,15 +72,12 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

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

 #else   //!USE_OWNER_DRAWN
 #else   //!USE_OWNER_DRAWN

-  IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)

 #endif  //USE_OWNER_DRAWN
 
 #endif  //USE_OWNER_DRAWN
 

-#endif  //USE_SHARED_LIBRARY
-

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


@@ -53,93 +85,185 @@
 // ctor & dtor
 // -----------
 
 // ctor & dtor
 // -----------
 

-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxTString& strName, const wxTString& strHelp,
+wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& strHelp,

                        bool bCheckable,
                        bool bCheckable,

-                       wxMenu *pSubMenu) :
-#if USE_OWNER_DRAWN
-                        wxOwnerDrawn(strName, bCheckable),
-#else   //no owner drawn support
-                        m_bCheckable(bCheckable),
-                        m_strName(strName),
-#endif  //owner drawn
-                        m_strHelp(strHelp)
+                       wxMenu *pSubMenu)
+#if wxUSE_OWNER_DRAWN
+                       : wxOwnerDrawn(GetLabelFromText(text), bCheckable)
+#endif // owner drawn

 {
 {

-  wxASSERT( pParentMenu != NULL );
+    wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );

 
 

-#ifdef  USE_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::GetSystemColour(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
-#endif
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(text.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN

 
 

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

 {
 }
 
 // misc
 // ----
 
 {
 }
 
 // misc
 // ----
 

-// delete the sub menu
-void wxMenuItem::DeleteSubMenu()
+// return the id for calling Win32 API functions
+int wxMenuItem::GetRealId() const
+{
+    return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
+}
+
+// get item state
+// --------------
+
+bool wxMenuItem::IsChecked() const

 {
 {

-  wxASSERT( m_pSubMenu != NULL );
+    int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);

 
 

-  delete m_pSubMenu;
-  m_pSubMenu = NULL;
+    return (flag & MF_CHECKED) != 0;
+}
+
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);

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

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

 {
 {

-  if ( m_bEnabled != bDoEnable ) {
-    if ( m_pSubMenu == NULL ) {     // normal menu item
-      EnableMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, 
-                     MF_BYCOMMAND | (bDoEnable ? MF_ENABLED: MF_GRAYED));
+    if ( m_isEnabled == enable )
+        return;
+
+    long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
+                             GetRealId(),
+                             MF_BYCOMMAND |
+                             (enable ? MF_ENABLED : MF_GRAYED));
+
+    if ( rc == -1 ) {
+        wxLogLastError(wxT("EnableMenuItem"));

     }
     }

-    else                            // submenu
+
+    wxMenuItemBase::Enable(enable);
+}
+
+void wxMenuItem::Check(bool check)
+{
+    wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") );
+
+    if ( m_isChecked == check )
+        return;
+
+    long rc = CheckMenuItem(GetHMenuOf(m_parentMenu),
+                            GetRealId(),
+                            MF_BYCOMMAND |
+                            (check ? MF_CHECKED : MF_UNCHECKED));
+
+    if ( rc == -1 ) {
+        wxLogLastError(wxT("CheckMenuItem"));
+    }
+
+    wxMenuItemBase::Check(check);
+}
+
+void wxMenuItem::SetText(const wxString& text)
+{
+    // don't do anything if label didn't change
+    if ( m_text == text )
+        return;
+
+    wxMenuItemBase::SetText(text);
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+
+    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 )

     {
     {

-      wxMenu *father = m_pSubMenu->m_topLevelMenu ;
-      wxNode *node = father->m_menuItems.First() ;
-      int i = 0 ;
-      while (node) {
-        wxMenuItem *matched = (wxMenuItem*)node->Data();
-        if ( matched == this)
-          break;
-        i++;
-        node = node->Next();
-      }
-      EnableMenuItem((HMENU)father->m_savehMenu, i, 
-                     MF_BYPOSITION | (bDoEnable ? MF_ENABLED: MF_GRAYED));
+        wxLogLastError(wxT("GetMenuState"));

     }
     }

+    else
+    {
+        if ( IsSubMenu() )
+        {
+            // high byte contains the number of items in a submenu for submenus
+            flagsOld &= 0xFF;
+            flagsOld |= MF_POPUP;
+        }
+
+        LPCTSTR data;

 
 

-    m_bEnabled = bDoEnable;
-  }
+#if wxUSE_OWNER_DRAWN
+        if ( IsOwnerDrawn() )
+        {
+            flagsOld |= MF_OWNERDRAW;
+            data = (LPCTSTR)this;
+        }
+        else
+#endif  //owner drawn
+        {
+            flagsOld |= MF_STRING;
+            data = (wxChar*) text.c_str();
+        }
+
+        if ( ::ModifyMenu(hMenu, id,
+                          MF_BYCOMMAND | flagsOld,
+                          id, data) == (int)0xFFFFFFFF )
+        {
+            wxLogLastError(wxT("ModifyMenu"));
+        }
+    }

 }
 
 }
 

-void wxMenuItem::Check(bool bDoCheck)
+void wxMenuItem::SetCheckable(bool checkable)

 {
 {

-  wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+    wxMenuItemBase::SetCheckable(checkable);
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------

 
 

-  if ( m_bChecked != bDoCheck ) {
-    CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, 
-                  MF_BYCOMMAND | (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}

 
 

-    m_bChecked = bDoCheck;
-  }
-}
\ No newline at end of file
+#endif // wxUSE_MENUS