Also allow key events for Shift-Tab when wxWANTS_CHARS style is used

[wxWidgets.git] / src / univ / menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 6a64d031b96388767aec1846dffcd6fd85f3a607..bce164c6444c02cc3ac38088b4822da5a1ccf823 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univmenuitem.h"
     #pragma implementation "univmenu.h"
 #endif
     #pragma implementation "univmenuitem.h"
     #pragma implementation "univmenu.h"
 #endif


@@ -123,7 +123,7 @@ class wxPopupMenuWindow : public wxPopupTransientWindow
 {
 public:
     wxPopupMenuWindow(wxWindow *parent, wxMenu *menu);
 {
 public:
     wxPopupMenuWindow(wxWindow *parent, wxMenu *menu);

-    
+

     ~wxPopupMenuWindow();
 
     // override the base class version to select the first item initially
     ~wxPopupMenuWindow();
 
     // override the base class version to select the first item initially


@@ -145,7 +145,7 @@ public:
     }
 
     // find the menu item at given position
     }
 
     // find the menu item at given position

-    wxMenuItemList::Node *GetMenuItemFromPoint(const wxPoint& pt) const;
+    wxMenuItemList::compatibility_iterator GetMenuItemFromPoint(const wxPoint& pt) const;

 
     // refresh the given item
     void RefreshItem(wxMenuItem *item);
 
     // refresh the given item
     void RefreshItem(wxMenuItem *item);


@@ -183,10 +183,11 @@ protected:
     void ResetCurrent();
 
     // set the current node and item withotu refreshing anything
     void ResetCurrent();
 
     // set the current node and item withotu refreshing anything

-    void SetCurrent(wxMenuItemList::Node *node);
+    void SetCurrent(wxMenuItemList::compatibility_iterator node);
+    virtual bool SetCurrent(bool doit = true){return wxPopupTransientWindow::SetCurrent(doit);};

 
     // change the current item refreshing the old and new items
 
     // change the current item refreshing the old and new items

-    void ChangeCurrent(wxMenuItemList::Node *node);
+    void ChangeCurrent(wxMenuItemList::compatibility_iterator node);

 
     // activate item, i.e. call either ClickItem() or OpenSubmenu() depending
     // on what it is, return TRUE if something was done (i.e. it's not a
 
     // activate item, i.e. call either ClickItem() or OpenSubmenu() depending
     // on what it is, return TRUE if something was done (i.e. it's not a


@@ -216,23 +217,23 @@ protected:
     bool HasOpenSubmenu() const { return m_hasOpenSubMenu; }
 
     // get previous node after the current one
     bool HasOpenSubmenu() const { return m_hasOpenSubMenu; }
 
     // get previous node after the current one

-    wxMenuItemList::Node *GetPrevNode() const;
+    wxMenuItemList::compatibility_iterator GetPrevNode() const;

 
     // get previous node before the given one, wrapping if it's the first one
 
     // get previous node before the given one, wrapping if it's the first one

-    wxMenuItemList::Node *GetPrevNode(wxMenuItemList::Node *node) const;
+    wxMenuItemList::compatibility_iterator GetPrevNode(wxMenuItemList::compatibility_iterator node) const;

 
     // get next node after the current one
 
     // get next node after the current one

-    wxMenuItemList::Node *GetNextNode() const;
+    wxMenuItemList::compatibility_iterator GetNextNode() const;

 
     // get next node after the given one, wrapping if it's the last one
 
     // get next node after the given one, wrapping if it's the last one

-    wxMenuItemList::Node *GetNextNode(wxMenuItemList::Node *node) const;
+    wxMenuItemList::compatibility_iterator GetNextNode(wxMenuItemList::compatibility_iterator node) const;

 
 private:
     // the menu we show
     wxMenu *m_menu;
 
     // the menu node corresponding to the current item
 
 private:
     // the menu we show
     wxMenu *m_menu;
 
     // the menu node corresponding to the current item

-    wxMenuItemList::Node *m_nodeCurrent;
+    wxMenuItemList::compatibility_iterator m_nodeCurrent;

 
     // do we currently have an opened submenu?
     bool m_hasOpenSubMenu;
 
     // do we currently have an opened submenu?
     bool m_hasOpenSubMenu;


@@ -258,7 +259,7 @@ public:
         else
         {
             // return FALSE;
         else
         {
             // return FALSE;

-            
+

             return wxEvtHandler::ProcessEvent(event);
         }
     }
             return wxEvtHandler::ProcessEvent(event);
         }
     }


@@ -314,6 +315,12 @@ wxPopupMenuWindow::wxPopupMenuWindow(wxWindow *parent, wxMenu *menu)
 
 wxPopupMenuWindow::~wxPopupMenuWindow()
 {
 
 wxPopupMenuWindow::~wxPopupMenuWindow()
 {

+    // When m_popupMenu in wxMenu is deleted because it
+    // is a child of an old menu bar being deleted (note: it does
+    // not get destroyed by the wxMenu destructor, but
+    // by DestroyChildren()), m_popupMenu should be reset to NULL.
+
+    m_menu->m_popupMenu = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -322,19 +329,23 @@ wxPopupMenuWindow::~wxPopupMenuWindow()
 
 void wxPopupMenuWindow::ResetCurrent()
 {
 
 void wxPopupMenuWindow::ResetCurrent()
 {

-    SetCurrent(NULL);
+#if wxUSE_STL
+    SetCurrent(wxMenuItemList::compatibility_iterator());
+#else
+    SetCurrent((wxwxMenuItemListNode *)NULL);
+#endif

 }
 
 }
 

-void wxPopupMenuWindow::SetCurrent(wxMenuItemList::Node *node)
+void wxPopupMenuWindow::SetCurrent(wxMenuItemList::compatibility_iterator node)

 {
     m_nodeCurrent = node;
 }
 
 {
     m_nodeCurrent = node;
 }
 

-void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::Node *node)
+void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::compatibility_iterator node)

 {
     if ( node != m_nodeCurrent )
     {
 {
     if ( node != m_nodeCurrent )
     {

-        wxMenuItemList::Node *nodeOldCurrent = m_nodeCurrent;
+        wxMenuItemList::compatibility_iterator nodeOldCurrent = m_nodeCurrent;

 
         m_nodeCurrent = node;
 
 
         m_nodeCurrent = node;
 


@@ -358,15 +369,15 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::Node *node)
     }
 }
 
     }
 }
 

-wxMenuItemList::Node *wxPopupMenuWindow::GetPrevNode() const
+wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetPrevNode() const

 {
     // return the last node if there had been no previously selected one
     return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
                          : m_menu->GetMenuItems().GetLast();
 }
 
 {
     // return the last node if there had been no previously selected one
     return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
                          : m_menu->GetMenuItems().GetLast();
 }
 

-wxMenuItemList::Node *
-wxPopupMenuWindow::GetPrevNode(wxMenuItemList::Node *node) const
+wxMenuItemList::compatibility_iterator
+wxPopupMenuWindow::GetPrevNode(wxMenuItemList::compatibility_iterator node) const

 {
     if ( node )
     {
 {
     if ( node )
     {


@@ -381,15 +392,15 @@ wxPopupMenuWindow::GetPrevNode(wxMenuItemList::Node *node) const
     return node;
 }
 
     return node;
 }
 

-wxMenuItemList::Node *wxPopupMenuWindow::GetNextNode() const
+wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetNextNode() const

 {
     // return the first node if there had been no previously selected one
     return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
                          : m_menu->GetMenuItems().GetFirst();
 }
 
 {
     // return the first node if there had been no previously selected one
     return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
                          : m_menu->GetMenuItems().GetFirst();
 }
 

-wxMenuItemList::Node *
-wxPopupMenuWindow::GetNextNode(wxMenuItemList::Node *node) const
+wxMenuItemList::compatibility_iterator
+wxPopupMenuWindow::GetNextNode(wxMenuItemList::compatibility_iterator node) const

 {
     if ( node )
     {
 {
     if ( node )
     {


@@ -482,7 +493,7 @@ void wxPopupMenuWindow::DismissAndNotify()
 // wxPopupMenuWindow geometry
 // ----------------------------------------------------------------------------
 
 // wxPopupMenuWindow geometry
 // ----------------------------------------------------------------------------
 

-wxMenuItemList::Node *
+wxMenuItemList::compatibility_iterator

 wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const
 {
     // we only use the y coord normally, but still check x in case the point is
 wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const
 {
     // we only use the y coord normally, but still check x in case the point is


@@ -490,7 +501,7 @@ wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const
     if ( wxWindow::HitTest(pt) == wxHT_WINDOW_INSIDE )
     {
         wxCoord y = 0;
     if ( wxWindow::HitTest(pt) == wxHT_WINDOW_INSIDE )
     {
         wxCoord y = 0;

-        for ( wxMenuItemList::Node *node = m_menu->GetMenuItems().GetFirst();
+        for ( wxMenuItemList::compatibility_iterator node = m_menu->GetMenuItems().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -504,7 +515,11 @@ wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const
         }
     }
 
         }
     }
 

+#if wxUSE_STL
+    return wxMenuItemList::compatibility_iterator();
+#else

     return NULL;
     return NULL;

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -538,7 +553,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
 
     wxCoord y = 0;
     const wxMenuGeometryInfo& gi = m_menu->GetGeometryInfo();
 
     wxCoord y = 0;
     const wxMenuGeometryInfo& gi = m_menu->GetGeometryInfo();

-    for ( wxMenuItemList::Node *node = m_menu->GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = m_menu->GetMenuItems().GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -605,7 +620,7 @@ void wxPopupMenuWindow::ClickItem(wxMenuItem *item)
 
     // close all menus
     DismissAndNotify();
 
     // close all menus
     DismissAndNotify();

-    
+

     menu->ClickItem(item);
 }
 
     menu->ClickItem(item);
 }
 


@@ -670,7 +685,7 @@ bool wxPopupMenuWindow::ProcessLeftDown(wxMouseEvent& event)
             wxPopupMenuWindow *win = menu->m_popupMenu;
 
             wxCHECK_MSG( win, FALSE, _T("parent menu not shown?") );
             wxPopupMenuWindow *win = menu->m_popupMenu;
 
             wxCHECK_MSG( win, FALSE, _T("parent menu not shown?") );

-            
+

             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )
             {
             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )
             {


@@ -686,7 +701,7 @@ bool wxPopupMenuWindow::ProcessLeftDown(wxMouseEvent& event)
 
 void wxPopupMenuWindow::OnLeftUp(wxMouseEvent& event)
 {
 
 void wxPopupMenuWindow::OnLeftUp(wxMouseEvent& event)
 {

-    wxMenuItemList::Node *node = GetMenuItemFromPoint(event.GetPosition());
+    wxMenuItemList::compatibility_iterator node = GetMenuItemFromPoint(event.GetPosition());

     if ( node )
     {
         ActivateItem(node->GetData(), WithMouse);
     if ( node )
     {
         ActivateItem(node->GetData(), WithMouse);


@@ -720,7 +735,7 @@ void wxPopupMenuWindow::OnMouseMove(wxMouseEvent& event)
 
 void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
 {
 
 void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
 {

-    wxMenuItemList::Node *node = GetMenuItemFromPoint(pt);
+    wxMenuItemList::compatibility_iterator node = GetMenuItemFromPoint(pt);

 
     // don't reset current to NULL here, we only do it when the mouse leaves
     // the window (see below)
 
     // don't reset current to NULL here, we only do it when the mouse leaves
     // the window (see below)


@@ -811,7 +826,11 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event)
 
         if ( resetCurrent )
         {
 
         if ( resetCurrent )
         {

+#if wxUSE_STL
+            ChangeCurrent(wxMenuItemList::compatibility_iterator());
+#else

             ChangeCurrent(NULL);
             ChangeCurrent(NULL);

+#endif

         }
     }
 
         }
     }
 


@@ -883,9 +902,9 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
             {
                 bool up = key == WXK_UP;
 
             {
                 bool up = key == WXK_UP;
 

-                wxMenuItemList::Node *nodeStart = up ? GetPrevNode()
+                wxMenuItemList::compatibility_iterator nodeStart = up ? GetPrevNode()

                                                      : GetNextNode(),
                                                      : GetNextNode(),

-                                     *node = nodeStart;
+                                     node = nodeStart;

                 while ( node && node->GetData()->IsSeparator() )
                 {
                     node = up ? GetPrevNode(node) : GetNextNode(node);
                 while ( node && node->GetData()->IsSeparator() )
                 {
                     node = up ? GetPrevNode(node) : GetNextNode(node);


@@ -894,7 +913,11 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                     {
                         // nothing but separators and disabled items in this
                         // menu, break out
                     {
                         // nothing but separators and disabled items in this
                         // menu, break out

+#if wxUSE_STL
+                        node = wxMenuItemList::compatibility_iterator();
+#else

                         node = NULL;
                         node = NULL;

+#endif

                     }
                 }
 
                     }
                 }
 


@@ -928,7 +951,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                 // we want to start from the item after this one because
                 // if we're already on the item with the given accel we want to
                 // go to the next one, not to stay in place
                 // we want to start from the item after this one because
                 // if we're already on the item with the given accel we want to
                 // go to the next one, not to stay in place

-                wxMenuItemList::Node *nodeStart = GetNextNode();
+                wxMenuItemList::compatibility_iterator nodeStart = GetNextNode();

 
                 // do we have more than one item with this accel?
                 bool notUnique = FALSE;
 
                 // do we have more than one item with this accel?
                 bool notUnique = FALSE;


@@ -938,8 +961,12 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
 
                 // loop through all items searching for the item with this
                 // accel
 
                 // loop through all items searching for the item with this
                 // accel

-                wxMenuItemList::Node *node = nodeStart,
-                                     *nodeFound = NULL;
+                wxMenuItemList::compatibility_iterator node = nodeStart,
+#if wxUSE_STL
+                                                       nodeFound = wxMenuItemList::compatibility_iterator();
+#else
+                                                       nodeFound = NULL;
+#endif

                 for ( ;; )
                 {
                     item = node->GetData();
                 for ( ;; )
                 {
                     item = node->GetData();


@@ -1012,6 +1039,8 @@ void wxMenu::Init()
     m_geometry = NULL;
 
     m_popupMenu = NULL;
     m_geometry = NULL;
 
     m_popupMenu = NULL;

+
+    m_startRadioGroup = -1;

 }
 
 wxMenu::~wxMenu()
 }
 
 wxMenu::~wxMenu()


@@ -1075,24 +1104,75 @@ void wxMenu::OnItemAdded(wxMenuItem *item)
     }
 }
 
     }
 }
 

-bool wxMenu::DoAppend(wxMenuItem *item)
+void wxMenu::EndRadioGroup()

 {
 {

+    // we're not inside a radio group any longer
+    m_startRadioGroup = -1;
+}
+
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
+{
+    #if 0
+    // not used at all
+    bool check = FALSE;
+    #endif
+
+    if ( item->GetKind() == wxITEM_RADIO )
+    {
+        int count = GetMenuItemCount();
+
+        if ( m_startRadioGroup == -1 )
+        {
+            // start a new radio group
+            m_startRadioGroup = count;
+
+            // for now it has just one element
+            item->SetAsRadioGroupStart();
+            item->SetRadioGroupEnd(m_startRadioGroup);
+
+            // ensure that we have a checked item in the radio group
+            #if 0
+            // not used at all
+            check = TRUE;
+            #endif
+        }
+        else // extend the current radio group
+        {
+            // we need to update its end item
+            item->SetRadioGroupStart(m_startRadioGroup);
+            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
+
+            if ( node )
+            {
+                node->GetData()->SetRadioGroupEnd(count);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );
+            }
+        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }
+

     if ( !wxMenuBase::DoAppend(item) )
     if ( !wxMenuBase::DoAppend(item) )

-        return FALSE;
+        return NULL;

 
     OnItemAdded(item);
 
 
     OnItemAdded(item);
 

-    return TRUE;
+    return item;

 }
 
 }
 

-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)

 {
     if ( !wxMenuBase::DoInsert(pos, item) )
 {
     if ( !wxMenuBase::DoInsert(pos, item) )

-        return FALSE;
+        return NULL;

 
     OnItemAdded(item);
 
 
     OnItemAdded(item);
 

-    return TRUE;
+    return item;

 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)


@@ -1165,7 +1245,7 @@ wxWindow *wxMenu::GetRootWindow() const
         // We are a submenu of a menu of a menubar
         if (menu->GetMenuBar())
            return menu->GetMenuBar();
         // We are a submenu of a menu of a menubar
         if (menu->GetMenuBar())
            return menu->GetMenuBar();

-    
+

         win = menu->GetInvokingWindow();
         if ( win )
             break;
         win = menu->GetInvokingWindow();
         if ( win )
             break;


@@ -1176,7 +1256,7 @@ wxWindow *wxMenu::GetRootWindow() const
     // we're probably going to crash in the caller anyhow, but try to detect
     // this error as soon as possible
     wxASSERT_MSG( win, _T("menu without any associated window?") );
     // we're probably going to crash in the caller anyhow, but try to detect
     // this error as soon as possible
     wxASSERT_MSG( win, _T("menu without any associated window?") );

-    
+

     // also remember it in this menu so that we don't have to search for it the
     // next time
     wxConstCast(this, wxMenu)->m_invokingWindow = win;
     // also remember it in this menu so that we don't have to search for it the
     // next time
     wxConstCast(this, wxMenu)->m_invokingWindow = win;


@@ -1253,7 +1333,7 @@ void wxMenu::OnDismiss(bool dismissParent)
             wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") );
 
             m_invokingWindow->DismissPopupMenu();
             wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") );
 
             m_invokingWindow->DismissPopupMenu();

-            
+

             // Why reset it here? We need it for sending the event to...
             // SetInvokingWindow(NULL);
         }
             // Why reset it here? We need it for sending the event to...
             // SetInvokingWindow(NULL);
         }


@@ -1273,7 +1353,7 @@ void wxMenu::Popup(const wxPoint& pos, const wxSize& size, bool selectFirst)
     {
         m_popupMenu->SelectFirst();
     }
     {
         m_popupMenu->SelectFirst();
     }

-    
+

     // the geometry might have changed since the last time we were shown, so
     // always resize
     m_popupMenu->SetClientSize(GetGeometryInfo().GetSize());
     // the geometry might have changed since the last time we were shown, so
     // always resize
     m_popupMenu->SetClientSize(GetGeometryInfo().GetSize());


@@ -1325,7 +1405,7 @@ bool wxMenu::ClickItem(wxMenuItem *item)
         // not applicabled
         isChecked = -1;
     }
         // not applicabled
         isChecked = -1;
     }

-    
+

     return SendEvent(item->GetId(), isChecked);
 }
 
     return SendEvent(item->GetId(), isChecked);
 }
 


@@ -1345,7 +1425,7 @@ bool wxMenu::ProcessAccelEvent(const wxKeyEvent& event)
     }
 
     // try our submenus
     }
 
     // try our submenus

-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -1404,6 +1484,9 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
     m_posY =
     m_height = -1;
 
     m_posY =
     m_height = -1;
 

+    m_radioGroup.start = -1;
+    m_isRadioGroupStart = FALSE;
+

     UpdateAccelInfo();
 }
 
     UpdateAccelInfo();
 }
 


@@ -1493,12 +1576,79 @@ void wxMenuItem::Enable(bool enable)
 
 void wxMenuItem::Check(bool check)
 {
 
 void wxMenuItem::Check(bool check)
 {

-    if ( check != m_isChecked )
+    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
+
+    if ( m_isChecked == check )
+        return;
+
+    if ( GetKind() == wxITEM_RADIO )

     {
     {

-        wxMenuItemBase::Check(check);
+        // it doesn't make sense to uncheck a radio item - what would this do?
+        if ( !check )
+            return;

 
 

-        NotifyMenu();
+        // 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;
+        }
+
+        // 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;
+            }
+            node = node->GetNext();
+        }

     }
     }

+
+    wxMenuItemBase::Check(check);
+
+    NotifyMenu();
+}
+
+// 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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1514,8 +1664,6 @@ void wxMenuBar::Init()
     m_menuShown = NULL;
 
     m_shouldShowMenu = FALSE;
     m_menuShown = NULL;
 
     m_shouldShowMenu = FALSE;

-    
-    m_windowStyle |= wxNO_FULL_REPAINT_ON_RESIZE;

 }
 
 void wxMenuBar::Attach(wxFrame *frame)
 }
 
 void wxMenuBar::Attach(wxFrame *frame)


@@ -2212,7 +2360,7 @@ int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 bool wxMenuBar::ProcessAccelEvent(const wxKeyEvent& event)
 {
     size_t n = 0;
 bool wxMenuBar::ProcessAccelEvent(const wxKeyEvent& event)
 {
     size_t n = 0;

-    for ( wxMenuList::Node *node = m_menus.GetFirst();
+    for ( wxMenuList::compatibility_iterator node = m_menus.GetFirst();

           node;
           node = node->GetNext(), n++ )
     {
           node;
           node = node->GetNext(), n++ )
     {


@@ -2242,7 +2390,7 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
     wxCHECK_RET( m_current != -1, _T("no menu to popup") );
 
     // forgot to call DismissMenu()?
     wxCHECK_RET( m_current != -1, _T("no menu to popup") );
 
     // forgot to call DismissMenu()?

-    wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menu at once!") );
+    wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menus at once!") );

 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = TRUE;
 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = TRUE;


@@ -2340,8 +2488,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     wxLog::FlushActive();
 
     // some controls update themselves from OnIdle() call - let them do it
     wxLog::FlushActive();
 
     // some controls update themselves from OnIdle() call - let them do it

-    wxIdleEvent event;
-    wxTheApp->ProcessEvent(event);
+    wxTheApp->ProcessIdle();

 
     // if the window hadn't been refreshed yet, the menu can adversely affect
     // its next OnPaint() handler execution - i.e. scrolled window refresh
 
     // if the window hadn't been refreshed yet, the menu can adversely affect
     // its next OnPaint() handler execution - i.e. scrolled window refresh


@@ -2351,9 +2498,9 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 #endif // 0
 
     menu->SetInvokingWindow(this);
 #endif // 0
 
     menu->SetInvokingWindow(this);

-    
+

     // wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );
     // wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );

-    
+

     menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0, 0));
 
     // this is not very useful if the menu was popped up because of the mouse
     menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0, 0));
 
     // this is not very useful if the menu was popped up because of the mouse


@@ -2388,7 +2535,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 void wxWindow::DismissPopupMenu()
 {
     wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") );
 void wxWindow::DismissPopupMenu()
 {
     wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") );

-    
+

     ms_evtLoopPopup->Exit();
 }
 
     ms_evtLoopPopup->Exit();
 }