Add entry for 2.8.0.1

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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index e8916af3a8b87b83bc1ee0262641e6f44e593a50..2d3fa88a55101453f890433e4a03cf8a24a7f44f 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -25,19 +25,21 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

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

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/control.h"      // for FindAccelIndex()
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/control.h"      // for FindAccelIndex()

-    #include "wx/menu.h"

     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"

+    #include "wx/frame.h"
+    #include "wx/dcclient.h"

 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"
 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"

-#include "wx/dcclient.h"
-#include "wx/frame.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 


@@ -45,6 +47,8 @@
     #include "wx/msw/private.h"
 #endif // __WXMSW__
 
     #include "wx/msw/private.h"
 #endif // __WXMSW__
 

+typedef wxMenuItemList::compatibility_iterator wxMenuItemIter;
+

 // ----------------------------------------------------------------------------
 // wxMenuInfo contains all extra information about top level menus we need
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenuInfo contains all extra information about top level menus we need
 // ----------------------------------------------------------------------------


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

-    ~wxPopupMenuWindow();
+    virtual ~wxPopupMenuWindow();

 
     // override the base class version to select the first item initially
     virtual void Popup(wxWindow *focus = NULL);
 
     // override the base class version to select the first item initially
     virtual void Popup(wxWindow *focus = NULL);


@@ -144,13 +148,13 @@ public:
     }
 
     // find the menu item at given position
     }
 
     // find the menu item at given position

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

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

-    void SelectFirst() { SetCurrent(m_menu->GetMenuItems().GetFirst()); }
+    void SelectFirst() { SetCurrentItem(m_menu->GetMenuItems().GetFirst()); }

 
     // process the key event, return true if done
     bool ProcessKeyDown(int key);
 
     // process the key event, return true if done
     bool ProcessKeyDown(int key);


@@ -161,8 +165,6 @@ public:
     // don't dismiss the popup window if the parent menu was clicked
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 
     // don't dismiss the popup window if the parent menu was clicked
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 

-    virtual bool SetCurrent(bool doit = true) { return wxPopupTransientWindow::SetCurrent(doit); };
-

 protected:
     // how did we perform this operation?
     enum InputMethod
 protected:
     // how did we perform this operation?
     enum InputMethod


@@ -186,11 +188,11 @@ protected:
     // reset the current item and node
     void ResetCurrent();
 
     // reset the current item and node
     void ResetCurrent();
 

-    // set the current node and item withotu refreshing anything
-    void SetCurrent(wxMenuItemList::compatibility_iterator node);
+    // set the current node and item without refreshing anything
+    void SetCurrentItem(wxMenuItemIter node);

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

-    void ChangeCurrent(wxMenuItemList::compatibility_iterator node);
+    void ChangeCurrent(wxMenuItemIter 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


@@ -220,23 +222,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::compatibility_iterator GetPrevNode() const;
+    wxMenuItemIter 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::compatibility_iterator GetPrevNode(wxMenuItemList::compatibility_iterator node) const;
+    wxMenuItemIter GetPrevNode(wxMenuItemIter node) const;

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

-    wxMenuItemList::compatibility_iterator GetNextNode() const;
+    wxMenuItemIter 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::compatibility_iterator GetNextNode(wxMenuItemList::compatibility_iterator node) const;
+    wxMenuItemIter GetNextNode(wxMenuItemIter 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::compatibility_iterator m_nodeCurrent;
+    wxMenuItemIter m_nodeCurrent;

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


@@ -335,23 +337,19 @@ wxPopupMenuWindow::~wxPopupMenuWindow()
 
 void wxPopupMenuWindow::ResetCurrent()
 {
 
 void wxPopupMenuWindow::ResetCurrent()
 {

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

 }
 
 }
 

-void wxPopupMenuWindow::SetCurrent(wxMenuItemList::compatibility_iterator node)
+void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node)

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

-void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::compatibility_iterator node)
+void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)

 {
 {

-    if ( node != m_nodeCurrent )
+    if ( !m_nodeCurrent || !node || (node != m_nodeCurrent) )

     {
     {

-        wxMenuItemList::compatibility_iterator nodeOldCurrent = m_nodeCurrent;
+        wxMenuItemIter nodeOldCurrent = m_nodeCurrent;

 
         m_nodeCurrent = node;
 
 
         m_nodeCurrent = node;
 


@@ -375,15 +373,15 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::compatibility_iterator nod
     }
 }
 
     }
 }
 

-wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetPrevNode() const
+wxMenuItemIter wxPopupMenuWindow::GetPrevNode() const

 {
     // return the last node if there had been no previously selected one
     return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
 {
     // return the last node if there had been no previously selected one
     return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)

-                         : m_menu->GetMenuItems().GetLast();
+                         : wxMenuItemIter(m_menu->GetMenuItems().GetLast());

 }
 
 }
 

-wxMenuItemList::compatibility_iterator
-wxPopupMenuWindow::GetPrevNode(wxMenuItemList::compatibility_iterator node) const
+wxMenuItemIter
+wxPopupMenuWindow::GetPrevNode(wxMenuItemIter node) const

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


@@ -398,15 +396,15 @@ wxPopupMenuWindow::GetPrevNode(wxMenuItemList::compatibility_iterator node) cons
     return node;
 }
 
     return node;
 }
 

-wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetNextNode() const
+wxMenuItemIter wxPopupMenuWindow::GetNextNode() const

 {
     // return the first node if there had been no previously selected one
     return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
 {
     // return the first node if there had been no previously selected one
     return m_nodeCurrent ? GetNextNode(m_nodeCurrent)

-                         : m_menu->GetMenuItems().GetFirst();
+                         : wxMenuItemIter(m_menu->GetMenuItems().GetFirst());

 }
 
 }
 

-wxMenuItemList::compatibility_iterator
-wxPopupMenuWindow::GetNextNode(wxMenuItemList::compatibility_iterator node) const
+wxMenuItemIter
+wxPopupMenuWindow::GetNextNode(wxMenuItemIter node) const

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


@@ -509,7 +507,7 @@ void wxPopupMenuWindow::DismissAndNotify()
 // wxPopupMenuWindow geometry
 // ----------------------------------------------------------------------------
 
 // wxPopupMenuWindow geometry
 // ----------------------------------------------------------------------------
 

-wxMenuItemList::compatibility_iterator
+wxMenuItemIter

 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


@@ -517,7 +515,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::compatibility_iterator node = m_menu->GetMenuItems().GetFirst();
+        for ( wxMenuItemIter node = m_menu->GetMenuItems().GetFirst();

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


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

-#if wxUSE_STL
-    return wxMenuItemList::compatibility_iterator();
-#else
-    return NULL;
-#endif
+    return wxMenuItemIter();

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


@@ -569,7 +563,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::compatibility_iterator node = m_menu->GetMenuItems().GetFirst();
+    for ( wxMenuItemIter node = m_menu->GetMenuItems().GetFirst();

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


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

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

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


@@ -763,13 +757,13 @@ void wxPopupMenuWindow::OnMouseMove(wxMouseEvent& event)
 
 void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
 {
 
 void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
 {

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

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

-        if ( node != m_nodeCurrent )
+        if ( !m_nodeCurrent || (node != m_nodeCurrent) )

         {
             ChangeCurrent(node);
 
         {
             ChangeCurrent(node);
 


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

-#if wxUSE_STL
-            ChangeCurrent(wxMenuItemList::compatibility_iterator());
-#else
-            ChangeCurrent(NULL);
-#endif
+            ChangeCurrent(wxMenuItemIter());

         }
     }
 
         }
     }
 


@@ -936,9 +926,8 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
             {
                 bool up = key == WXK_UP;
 
             {
                 bool up = key == WXK_UP;
 

-                wxMenuItemList::compatibility_iterator nodeStart = up ? GetPrevNode()
-                                                     : GetNextNode(),
-                                     node = nodeStart;
+                wxMenuItemIter nodeStart = up ? GetPrevNode() : GetNextNode(),
+                               node = nodeStart;

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


@@ -947,11 +936,7 @@ 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;
-#endif
+                        node = wxMenuItemIter();

                     }
                 }
 
                     }
                 }
 


@@ -985,7 +970,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::compatibility_iterator nodeStart = GetNextNode();
+                wxMenuItemIter 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;


@@ -995,19 +980,15 @@ 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::compatibility_iterator node = nodeStart,
-#if wxUSE_STL
-                                                       nodeFound = wxMenuItemList::compatibility_iterator();
-#else
-                                                       nodeFound = NULL;
-#endif
+                wxMenuItemIter nodeFound,
+                               node = nodeStart;

                 for ( ;; )
                 {
                     item = node->GetData();
 
                     int idxAccel = item->GetAccelIndex();
                     if ( idxAccel != -1 &&
                 for ( ;; )
                 {
                     item = node->GetData();
 
                     int idxAccel = item->GetAccelIndex();
                     if ( idxAccel != -1 &&

-                         wxTolower(item->GetLabel()[(size_t)idxAccel])
+                         (wxChar)wxTolower(item->GetLabel()[(size_t)idxAccel])

                             == chAccel )
                     {
                         // ok, found an item with this accel
                             == chAccel )
                     {
                         // ok, found an item with this accel


@@ -1163,7 +1144,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
         {
             // we need to update its end item
             item->SetRadioGroupStart(m_startRadioGroup);
         {
             // we need to update its end item
             item->SetRadioGroupStart(m_startRadioGroup);

-            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
+            wxMenuItemIter node = GetMenuItems().Item(m_startRadioGroup);

 
             if ( node )
             {
 
             if ( node )
             {


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

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

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


@@ -1562,6 +1543,7 @@ void wxMenuItem::SetText(const wxString& text)
     if ( text != m_text )
     {
         // first call the base class version to change m_text
     if ( text != m_text )
     {
         // first call the base class version to change m_text

+        // (and also check if we don't have a stock menu item)

         wxMenuItemBase::SetText(text);
 
         UpdateAccelInfo();
         wxMenuItemBase::SetText(text);
 
         UpdateAccelInfo();


@@ -1636,7 +1618,7 @@ void wxMenuItem::Check(bool check)
         }
 
         // also uncheck all the other items in this radio group
         }
 
         // also uncheck all the other items in this radio group

-        wxMenuItemList::compatibility_iterator node = items.Item(start);
+        wxMenuItemIter node = items.Item(start);

         for ( int n = start; n <= end && node; n++ )
         {
             if ( n != pos )
         for ( int n = start; n <= end && node; n++ )
         {
             if ( n != pos )


@@ -2348,8 +2330,7 @@ int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 
         int idxAccel = info.GetAccelIndex();
         if ( idxAccel != -1 &&
 
         int idxAccel = info.GetAccelIndex();
         if ( idxAccel != -1 &&

-             wxTolower(info.GetLabel()[(size_t)idxAccel])
-                == chAccel )
+             (wxChar)wxTolower(info.GetLabel()[(size_t)idxAccel]) == chAccel )

         {
             // ok, found an item with this accel
             if ( idxFound == -1 )
         {
             // ok, found an item with this accel
             if ( idxFound == -1 )