New positioning code, eliminating a lot of extra, unnecessary methods

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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index ed3bd429ff1d8e2025258db6ce3b5f1bcf7b9f48..e5bf6a9e66d299344596545217dd711cd36173a5 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -98,7 +98,7 @@ private:
     {
         wxSize size;
         wxClientDC dc(menubar);
     {
         wxSize size;
         wxClientDC dc(menubar);

-        dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+        dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

         dc.GetTextExtent(m_label, &size.x, &size.y);
 
         // adjust for the renderer we use and store the width
         dc.GetTextExtent(m_label, &size.x, &size.y);
 
         // adjust for the renderer we use and store the width


@@ -326,9 +326,13 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::Node *node)
 {
     if ( node != m_nodeCurrent )
     {
 {
     if ( node != m_nodeCurrent )
     {

-        if ( m_nodeCurrent )
+        wxMenuItemList::Node *nodeOldCurrent = m_nodeCurrent;
+
+        m_nodeCurrent = node;
+
+        if ( nodeOldCurrent )

         {
         {

-            wxMenuItem *item = m_nodeCurrent->GetData();
+            wxMenuItem *item = nodeOldCurrent->GetData();

             wxCHECK_RET( item, _T("no current item?") );
 
             // if it was the currently opened menu, close it
             wxCHECK_RET( item, _T("no current item?") );
 
             // if it was the currently opened menu, close it


@@ -341,8 +345,6 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::Node *node)
             RefreshItem(item);
         }
 
             RefreshItem(item);
         }
 

-        m_nodeCurrent = node;
-

         if ( m_nodeCurrent )
             RefreshItem(m_nodeCurrent->GetData());
     }
         if ( m_nodeCurrent )
             RefreshItem(m_nodeCurrent->GetData());
     }


@@ -350,14 +352,9 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::Node *node)
 
 wxMenuItemList::Node *wxPopupMenuWindow::GetPrevNode() const
 {
 
 wxMenuItemList::Node *wxPopupMenuWindow::GetPrevNode() const
 {

-    wxMenuItemList::Node *node = m_nodeCurrent;
-    if ( !node )
-    {
-        // start from the end if no current item
-        node = m_menu->GetMenuItems().GetLast();
-    }
-
-    return GetPrevNode(node);
+    // return the last node if there had been no previously selected one
+    return m_nodeCurrent ? GetPrevNode(m_nodeCurrent)
+                         : m_menu->GetMenuItems().GetLast();

 }
 
 wxMenuItemList::Node *
 }
 
 wxMenuItemList::Node *


@@ -378,14 +375,9 @@ wxPopupMenuWindow::GetPrevNode(wxMenuItemList::Node *node) const
 
 wxMenuItemList::Node *wxPopupMenuWindow::GetNextNode() const
 {
 
 wxMenuItemList::Node *wxPopupMenuWindow::GetNextNode() const
 {

-    wxMenuItemList::Node *node = m_nodeCurrent;
-    if ( !node )
-    {
-        // start from the beginning if no current item
-        node = m_menu->GetMenuItems().GetFirst();
-    }
-
-    return GetNextNode(node);
+    // return the first node if there had been no previously selected one
+    return m_nodeCurrent ? GetNextNode(m_nodeCurrent)
+                         : m_menu->GetMenuItems().GetFirst();

 }
 
 wxMenuItemList::Node *
 }
 
 wxMenuItemList::Node *


@@ -528,7 +520,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
     // never partially covered as it is always on top of everything
 
     wxDC& dc = renderer->GetDC();
     // never partially covered as it is always on top of everything
 
     wxDC& dc = renderer->GetDC();

-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
     // FIXME: this should be done in the renderer, however when it is fixed
     //        wxPopupMenuWindow::RefreshItem() should be changed too!
 
     // FIXME: this should be done in the renderer, however when it is fixed
     //        wxPopupMenuWindow::RefreshItem() should be changed too!


@@ -601,10 +593,12 @@ void wxPopupMenuWindow::ClickItem(wxMenuItem *item)
     wxASSERT_MSG( !item->IsSeparator() && !item->IsSubMenu(),
                   _T("can't click this item") );
 
     wxASSERT_MSG( !item->IsSeparator() && !item->IsSubMenu(),
                   _T("can't click this item") );
 

-    m_menu->ClickItem(item);
+    wxMenu* menu = m_menu;

 
     // close all menus
     DismissAndNotify();
 
     // close all menus
     DismissAndNotify();

+    
+    menu->ClickItem(item);

 }
 
 void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how)
 }
 
 void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how)


@@ -1543,7 +1537,10 @@ void wxMenuBar::Attach(wxFrame *frame)
 
         SetCursor(wxCURSOR_ARROW);
 
 
         SetCursor(wxCURSOR_ARROW);
 

-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+        SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
+
+        // calculate and set our height (it won't be changed any more)
+        SetSize(-1, GetBestSize().y);

     }
 
     // remember the last frame which had us to avoid unnecessarily reparenting
     }
 
     // remember the last frame which had us to avoid unnecessarily reparenting


@@ -1680,6 +1677,12 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
 
 void wxMenuBar::RefreshAllItemsAfter(size_t pos)
 {
 
 void wxMenuBar::RefreshAllItemsAfter(size_t pos)
 {

+    if ( !IsCreated() )
+    {
+        // no need to refresh if nothing is shown yet
+        return;
+    }
+

     wxRect rect = GetItemRect(pos);
     rect.width = GetClientSize().x - rect.x;
     RefreshRect(rect);
     wxRect rect = GetItemRect(pos);
     rect.width = GetClientSize().x - rect.x;
     RefreshRect(rect);


@@ -1690,13 +1693,19 @@ void wxMenuBar::RefreshItem(size_t pos)
     wxCHECK_RET( pos != (size_t)-1,
                  _T("invalid item in wxMenuBar::RefreshItem") );
 
     wxCHECK_RET( pos != (size_t)-1,
                  _T("invalid item in wxMenuBar::RefreshItem") );
 

+    if ( !IsCreated() )
+    {
+        // no need to refresh if nothing is shown yet
+        return;
+    }
+

     RefreshRect(GetItemRect(pos));
 }
 
 void wxMenuBar::DoDraw(wxControlRenderer *renderer)
 {
     wxDC& dc = renderer->GetDC();
     RefreshRect(GetItemRect(pos));
 }
 
 void wxMenuBar::DoDraw(wxControlRenderer *renderer)
 {
     wxDC& dc = renderer->GetDC();

-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
     // redraw only the items which must be redrawn
 
 
     // redraw only the items which must be redrawn
 


@@ -1758,6 +1767,7 @@ void wxMenuBar::DoDraw(wxControlRenderer *renderer)
 wxRect wxMenuBar::GetItemRect(size_t pos) const
 {
     wxASSERT_MSG( pos < GetCount(), _T("invalid menu bar item index") );
 wxRect wxMenuBar::GetItemRect(size_t pos) const
 {
     wxASSERT_MSG( pos < GetCount(), _T("invalid menu bar item index") );

+    wxASSERT_MSG( IsCreated(), _T("can't call this method yet") );

 
     wxRect rect;
     rect.x =
 
     wxRect rect;
     rect.x =


@@ -1780,7 +1790,7 @@ wxSize wxMenuBar::DoGetBestClientSize() const
     if ( GetMenuCount() > 0 )
     {
         wxClientDC dc(wxConstCast(this, wxMenuBar));
     if ( GetMenuCount() > 0 )
     {
         wxClientDC dc(wxConstCast(this, wxMenuBar));

-        dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+        dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

         dc.GetTextExtent(GetLabelTop(0), &size.x, &size.y);
 
         // adjust for the renderer we use
         dc.GetTextExtent(GetLabelTop(0), &size.x, &size.y);
 
         // adjust for the renderer we use


@@ -1836,7 +1846,11 @@ void wxMenuBar::DoSelectMenu(size_t pos)
 {
     wxCHECK_RET( pos < GetCount(), _T("invalid menu index in DoSelectMenu") );
 
 {
     wxCHECK_RET( pos < GetCount(), _T("invalid menu index in DoSelectMenu") );
 

-    if ( m_current != -1 )
+    int posOld = m_current;
+
+    m_current = pos;
+
+    if ( posOld != -1 )

     {
         // close the previous menu
         if ( IsShowingMenu() )
     {
         // close the previous menu
         if ( IsShowingMenu() )


@@ -1850,11 +1864,9 @@ void wxMenuBar::DoSelectMenu(size_t pos)
             m_shouldShowMenu = old;
         }
 
             m_shouldShowMenu = old;
         }
 

-        RefreshItem((size_t)m_current);
+        RefreshItem((size_t)posOld);

     }
 
     }
 

-    m_current = pos;
-

     RefreshItem(pos);
 }
 
     RefreshItem(pos);
 }
 


@@ -1963,7 +1975,7 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
 
     // show the menu if we know that we should, even if we hadn't been showing
     // it before (this may happen if the previous menu was disabled)
 
     // show the menu if we know that we should, even if we hadn't been showing
     // it before (this may happen if the previous menu was disabled)

-    if ( m_shouldShowMenu )
+    if ( m_shouldShowMenu && !m_menuShown)

     {
         // open the new menu if the old one we closed had been opened
         PopupCurrentMenu(FALSE /* don't select first item - as Windows does */);
     {
         // open the new menu if the old one we closed had been opened
         PopupCurrentMenu(FALSE /* don't select first item - as Windows does */);


@@ -1974,8 +1986,24 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
 
 void wxMenuBar::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxMenuBar::OnKeyDown(wxKeyEvent& event)
 {

-    // the current item must have been set before
-    wxCHECK_RET( m_current != -1, _T("where is current item?") );
+    // ensure that we have a current item - we might not have it if we're
+    // given the focus with Alt or F10 press (and under GTK+ the menubar
+    // somehow gets the keyboard events even when it doesn't have focus...)
+    if ( m_current == -1 )
+    {
+        if ( !HasCapture() )
+        {
+            SelectMenu(0);
+        }
+        else // we do have capture
+        {
+            // we always maintain a valid current item while we're in modal
+            // state (i.e. have the capture)
+            wxFAIL_MSG( _T("how did we manage to lose current item?") );
+
+            return;
+        }
+    }

 
     int key = event.GetKeyCode();
 
 
     int key = event.GetKeyCode();
 


@@ -2036,7 +2064,7 @@ void wxMenuBar::OnKeyDown(wxKeyEvent& event)
                 }
                 else // right
                 {
                 }
                 else // right
                 {

-                    if ( ++currentNew == (int)count )
+                    if ( ++currentNew == count )

                         currentNew = 0;
                 }
 
                         currentNew = 0;
                 }
 


@@ -2223,6 +2251,7 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
             // that we pass 0 as width to position the menu exactly below the
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);
             // that we pass 0 as width to position the menu exactly below the
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);

+

             m_menuShown->Popup(ClientToScreen(rectItem.GetPosition()),
                                wxSize(0, rectItem.GetHeight()),
                                selectFirst);
             m_menuShown->Popup(ClientToScreen(rectItem.GetPosition()),
                                wxSize(0, rectItem.GetHeight()),
                                selectFirst);


@@ -2256,13 +2285,15 @@ void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 
 void wxMenuBar::OnDismiss()
 {
 
 void wxMenuBar::OnDismiss()
 {

-    ReleaseCapture();
+    if ( GetCapture() )
+        GetCapture()->ReleaseMouse();

 
     if ( m_current != -1 )
     {
 
     if ( m_current != -1 )
     {

-        RefreshItem((size_t)m_current);
-
+        size_t current = m_current;

         m_current = -1;
         m_current = -1;

+
+        RefreshItem(current);

     }
 
     GiveAwayFocus();
     }
 
     GiveAwayFocus();