1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index a71678454b65bed0833913fee3a9a9a940d05125..ae7eab4f2ac293d3919a9420607faafbb979045e 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univmenuitem.h"
-    #pragma implementation "univmenu.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -75,7 +70,7 @@ public:
         m_width = 0;
     }
 
         m_width = 0;
     }
 

-    void SetEnabled(bool enabled = TRUE) { m_isEnabled = enabled; }
+    void SetEnabled(bool enabled = true) { m_isEnabled = enabled; }

 
     // accessors
 
 
     // accessors
 


@@ -123,7 +118,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


@@ -136,7 +131,14 @@ public:
     virtual void OnDismiss();
 
     // called when a submenu is dismissed
     virtual void OnDismiss();
 
     // called when a submenu is dismissed

-    void OnSubmenuDismiss() { m_hasOpenSubMenu = FALSE; }
+    void OnSubmenuDismiss(bool dismissParent);
+
+    // the default wxMSW wxPopupTransientWindow::OnIdle disables the capture
+    // when the cursor is inside the popup, which dsables the menu tracking
+    // so override it to do nothing
+#ifdef __WXMSW__
+    void OnIdle(wxIdleEvent& WXUNUSED(event)) { }
+#endif

 
     // get the currently selected item (may be NULL)
     wxMenuItem *GetCurrentItem() const
 
     // get the currently selected item (may be NULL)
     wxMenuItem *GetCurrentItem() const


@@ -153,7 +155,7 @@ public:
     // preselect the first item
     void SelectFirst() { SetCurrent(m_menu->GetMenuItems().GetFirst()); }
 
     // preselect the first item
     void SelectFirst() { SetCurrent(m_menu->GetMenuItems().GetFirst()); }
 

-    // process the key event, return TRUE if done
+    // process the key event, return true if done

     bool ProcessKeyDown(int key);
 
     // process mouse move event
     bool ProcessKeyDown(int key);
 
     // process mouse move event


@@ -184,12 +186,13 @@ protected:
 
     // set the current node and item withotu refreshing anything
     void SetCurrent(wxMenuItemList::compatibility_iterator node);
 
     // set the current node and item withotu refreshing anything
     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
     void ChangeCurrent(wxMenuItemList::compatibility_iterator node);
 
     // activate item, i.e. call either ClickItem() or OpenSubmenu() depending
 
     // change the current item refreshing the old and new items
     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
+    // on what it is, return true if something was done (i.e. it's not a

     // separator...)
     bool ActivateItem(wxMenuItem *item, InputMethod how = WithKeyboard);
 
     // separator...)
     bool ActivateItem(wxMenuItem *item, InputMethod how = WithKeyboard);
 


@@ -257,8 +260,8 @@ public:
         }
         else
         {
         }
         else
         {

-            // return FALSE;
-            
+            // return false;
+

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


@@ -281,6 +284,9 @@ BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
     EVT_LEFT_UP(wxPopupMenuWindow::OnLeftUp)
     EVT_MOTION(wxPopupMenuWindow::OnMouseMove)
     EVT_LEAVE_WINDOW(wxPopupMenuWindow::OnMouseLeave)
     EVT_LEFT_UP(wxPopupMenuWindow::OnLeftUp)
     EVT_MOTION(wxPopupMenuWindow::OnMouseMove)
     EVT_LEAVE_WINDOW(wxPopupMenuWindow::OnMouseLeave)

+#ifdef __WXMSW__
+    EVT_IDLE(wxPopupMenuWindow::OnIdle)
+#endif

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMenuBar, wxMenuBarBase)


@@ -303,7 +309,7 @@ END_EVENT_TABLE()
 wxPopupMenuWindow::wxPopupMenuWindow(wxWindow *parent, wxMenu *menu)
 {
     m_menu = menu;
 wxPopupMenuWindow::wxPopupMenuWindow(wxWindow *parent, wxMenu *menu)
 {
     m_menu = menu;

-    m_hasOpenSubMenu = FALSE;
+    m_hasOpenSubMenu = false;

 
     ResetCurrent();
 
 
     ResetCurrent();
 


@@ -331,7 +337,7 @@ void wxPopupMenuWindow::ResetCurrent()
 #if wxUSE_STL
     SetCurrent(wxMenuItemList::compatibility_iterator());
 #else
 #if wxUSE_STL
     SetCurrent(wxMenuItemList::compatibility_iterator());
 #else

-    SetCurrent(NULL);
+    SetCurrent((wxwxMenuItemListNode *)NULL);

 #endif
 }
 
 #endif
 }
 


@@ -357,7 +363,7 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemList::compatibility_iterator nod
             if ( item->IsSubMenu() && item->GetSubMenu()->IsShown() )
             {
                 item->GetSubMenu()->Dismiss();
             if ( item->IsSubMenu() && item->GetSubMenu()->IsShown() )
             {
                 item->GetSubMenu()->Dismiss();

-                OnSubmenuDismiss();
+                OnSubmenuDismiss( false );

             }
 
             RefreshItem(item);
             }
 
             RefreshItem(item);


@@ -375,7 +381,7 @@ wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetPrevNode() const
                          : m_menu->GetMenuItems().GetLast();
 }
 
                          : m_menu->GetMenuItems().GetLast();
 }
 

-wxMenuItemList::compatibility_iterator 
+wxMenuItemList::compatibility_iterator

 wxPopupMenuWindow::GetPrevNode(wxMenuItemList::compatibility_iterator node) const
 {
     if ( node )
 wxPopupMenuWindow::GetPrevNode(wxMenuItemList::compatibility_iterator node) const
 {
     if ( node )


@@ -398,7 +404,7 @@ wxMenuItemList::compatibility_iterator wxPopupMenuWindow::GetNextNode() const
                          : m_menu->GetMenuItems().GetFirst();
 }
 
                          : m_menu->GetMenuItems().GetFirst();
 }
 

-wxMenuItemList::compatibility_iterator 
+wxMenuItemList::compatibility_iterator

 wxPopupMenuWindow::GetNextNode(wxMenuItemList::compatibility_iterator node) const
 {
     if ( node )
 wxPopupMenuWindow::GetNextNode(wxMenuItemList::compatibility_iterator node) const
 {
     if ( node )


@@ -427,6 +433,11 @@ void wxPopupMenuWindow::Popup(wxWindow *focus)
 
     wxPopupTransientWindow::Popup(focus);
 
 
     wxPopupTransientWindow::Popup(focus);
 

+    // the base class no-longer captures the mouse automatically when Popup
+    // is called, so do it here to allow the menu tracking to work
+    if ( !HasCapture() )
+        CaptureMouse();
+

 #ifdef __WXMSW__
     // ensure that this window is really on top of everything: without using
     // SetWindowPos() it can be covered by its parent menu which is not
 #ifdef __WXMSW__
     // ensure that this window is really on top of everything: without using
     // SetWindowPos() it can be covered by its parent menu which is not


@@ -462,30 +473,35 @@ void wxPopupMenuWindow::Dismiss()
         wxCHECK_RET( win, _T("opened submenu is not opened?") );
 
         win->Dismiss();
         wxCHECK_RET( win, _T("opened submenu is not opened?") );
 
         win->Dismiss();

-        OnSubmenuDismiss();
+        OnSubmenuDismiss( false );

     }
 
     wxPopupTransientWindow::Dismiss();
     }
 
     wxPopupTransientWindow::Dismiss();

+
+    ResetCurrent();

 }
 
 void wxPopupMenuWindow::OnDismiss()
 {
     // when we are dismissed because the user clicked elsewhere or we lost
     // focus in any other way, hide the parent menu as well
 }
 
 void wxPopupMenuWindow::OnDismiss()
 {
     // when we are dismissed because the user clicked elsewhere or we lost
     // focus in any other way, hide the parent menu as well

-    HandleDismiss(TRUE);
+    HandleDismiss(true);

 }
 
 }
 

-void wxPopupMenuWindow::HandleDismiss(bool dismissParent)
+void wxPopupMenuWindow::OnSubmenuDismiss(bool WXUNUSED(dismissParent))

 {
 {

-    ResetCurrent();
+    m_hasOpenSubMenu = false;
+}

 
 

+void wxPopupMenuWindow::HandleDismiss(bool dismissParent)
+{

     m_menu->OnDismiss(dismissParent);
 }
 
 void wxPopupMenuWindow::DismissAndNotify()
 {
     Dismiss();
     m_menu->OnDismiss(dismissParent);
 }
 
 void wxPopupMenuWindow::DismissAndNotify()
 {
     Dismiss();

-    HandleDismiss(TRUE);
+    HandleDismiss(true);

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


@@ -584,6 +600,21 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
             if ( item == GetCurrentItem() )
                 flags |= wxCONTROL_SELECTED;
 
             if ( item == GetCurrentItem() )
                 flags |= wxCONTROL_SELECTED;
 

+            wxBitmap bmp;
+
+            if ( !item->IsEnabled() )
+            {
+                bmp = item->GetDisabledBitmap();
+            }
+
+            if ( !bmp.Ok() )
+            {
+                // strangely enough, for unchecked item we use the
+                // "checked" bitmap because this is the default one - this
+                // explains this strange boolean expression
+                bmp = item->GetBitmap(!item->IsCheckable() || item->IsChecked());
+            }
+

             rend->DrawMenuItem
                   (
                      dc,
             rend->DrawMenuItem
                   (
                      dc,


@@ -591,10 +622,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
                      gi,
                      item->GetLabel(),
                      item->GetAccelString(),
                      gi,
                      item->GetLabel(),
                      item->GetAccelString(),

-                     // strangely enough, for unchecked item we use the
-                     // "checked" bitmap because this is the default one - this
-                     // explains this strange boolean expression
-                     item->GetBitmap(!item->IsCheckable() || item->IsChecked()),
+                     bmp,

                      flags,
                      item->GetAccelIndex()
                   );
                      flags,
                      item->GetAccelIndex()
                   );


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

-    
+

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


@@ -635,7 +663,7 @@ void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how)
                    wxSize(m_menu->GetGeometryInfo().GetSize().x, 0),
                    how == WithKeyboard /* preselect first item then */);
 
                    wxSize(m_menu->GetGeometryInfo().GetSize().x, 0),
                    how == WithKeyboard /* preselect first item then */);
 

-    m_hasOpenSubMenu = TRUE;
+    m_hasOpenSubMenu = true;

 }
 
 bool wxPopupMenuWindow::ActivateItem(wxMenuItem *item, InputMethod how)
 }
 
 bool wxPopupMenuWindow::ActivateItem(wxMenuItem *item, InputMethod how)


@@ -643,7 +671,7 @@ bool wxPopupMenuWindow::ActivateItem(wxMenuItem *item, InputMethod how)
     // don't activate disabled items
     if ( !item || !item->IsEnabled() )
     {
     // don't activate disabled items
     if ( !item || !item->IsEnabled() )
     {

-        return FALSE;
+        return false;

     }
 
     // normal menu items generate commands, submenus can be opened and
     }
 
     // normal menu items generate commands, submenus can be opened and


@@ -658,10 +686,10 @@ bool wxPopupMenuWindow::ActivateItem(wxMenuItem *item, InputMethod how)
     }
     else // separator, can't activate
     {
     }
     else // separator, can't activate
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

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


@@ -683,19 +711,19 @@ bool wxPopupMenuWindow::ProcessLeftDown(wxMouseEvent& event)
         {
             wxPopupMenuWindow *win = menu->m_popupMenu;
 
         {
             wxPopupMenuWindow *win = menu->m_popupMenu;
 

-            wxCHECK_MSG( win, FALSE, _T("parent menu not shown?") );
-            
+            wxCHECK_MSG( win, false, _T("parent menu not shown?") );
+

             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )
             {
                 // eat the event
             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )
             {
                 // eat the event

-                return TRUE;
+                return true;

             }
             //else: it is outside the parent menu as well, do dismiss this one
         }
     }
 
             }
             //else: it is outside the parent menu as well, do dismiss this one
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxPopupMenuWindow::OnLeftUp(wxMouseEvent& event)
 }
 
 void wxPopupMenuWindow::OnLeftUp(wxMouseEvent& event)


@@ -820,7 +848,7 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event)
         else
         {
             // this menu is the last opened
         else
         {
             // this menu is the last opened

-            resetCurrent = TRUE;
+            resetCurrent = true;

         }
 
         if ( resetCurrent )
         }
 
         if ( resetCurrent )


@@ -838,7 +866,13 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event)
 
 void wxPopupMenuWindow::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxPopupMenuWindow::OnKeyDown(wxKeyEvent& event)
 {

-    if ( !ProcessKeyDown(event.GetKeyCode()) )
+    wxMenuBar *menubar = m_menu->GetMenuBar();
+
+    if ( menubar )
+    {
+        menubar->ProcessEvent(event);
+    }
+    else if ( !ProcessKeyDown(event.GetKeyCode()) )

     {
         event.Skip();
     }
     {
         event.Skip();
     }


@@ -853,14 +887,14 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
     // to open it inspit of this)
     if ( HasOpenSubmenu() )
     {
     // to open it inspit of this)
     if ( HasOpenSubmenu() )
     {

-        wxCHECK_MSG( CanOpen(item), FALSE,
+        wxCHECK_MSG( CanOpen(item), false,

                      _T("has open submenu but another item selected?") );
 
         if ( item->GetSubMenu()->ProcessKeyDown(key) )
                      _T("has open submenu but another item selected?") );
 
         if ( item->GetSubMenu()->ProcessKeyDown(key) )

-            return TRUE;
+            return true;

     }
 
     }
 

-    bool processed = TRUE;
+    bool processed = true;

 
     // handle the up/down arrows, home, end, esc and return here, pass the
     // left/right arrows to the menu bar except when the right arrow can be
 
     // handle the up/down arrows, home, end, esc and return here, pass the
     // left/right arrows to the menu bar except when the right arrow can be


@@ -872,7 +906,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
             // menubar
             if ( !m_menu->GetParent() )
             {
             // menubar
             if ( !m_menu->GetParent() )
             {

-                processed = FALSE;
+                processed = false;

                 break;
             }
 
                 break;
             }
 


@@ -881,7 +915,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
         case WXK_ESCAPE:
             // close just this menu
             Dismiss();
         case WXK_ESCAPE:
             // close just this menu
             Dismiss();

-            HandleDismiss(FALSE);
+            HandleDismiss(false);

             break;
 
         case WXK_RETURN:
             break;
 
         case WXK_RETURN:


@@ -926,7 +960,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                 }
                 else
                 {
                 }
                 else
                 {

-                    processed = FALSE;
+                    processed = false;

                 }
             }
             break;
                 }
             }
             break;


@@ -939,13 +973,13 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
             }
             else
             {
             }
             else
             {

-                processed = FALSE;
+                processed = false;

             }
             break;
 
         default:
             // look for the menu item starting with this letter
             }
             break;
 
         default:
             // look for the menu item starting with this letter

-            if ( wxIsalnum(key) )
+            if ( wxIsalnum((wxChar)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
             {
                 // 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


@@ -953,10 +987,10 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                 wxMenuItemList::compatibility_iterator nodeStart = GetNextNode();
 
                 // do we have more than one item with this accel?
                 wxMenuItemList::compatibility_iterator nodeStart = GetNextNode();
 
                 // do we have more than one item with this accel?

-                bool notUnique = FALSE;
+                bool notUnique = false;

 
                 // translate everything to lower case before comparing
 
                 // translate everything to lower case before comparing

-                wxChar chAccel = wxTolower(key);
+                wxChar chAccel = (wxChar)wxTolower(key);

 
                 // loop through all items searching for the item with this
                 // accel
 
                 // loop through all items searching for the item with this
                 // accel


@@ -985,7 +1019,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                         }
                         else // we already had found such item
                         {
                         }
                         else // we already had found such item
                         {

-                            notUnique = TRUE;
+                            notUnique = true;

 
                             // no need to continue further, we won't find
                             // anything we don't already know
 
                             // no need to continue further, we won't find
                             // anything we don't already know


@@ -1018,12 +1052,12 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
                     //else: just select it but don't activate as the user might
                     //      have wanted to activate another item
 
                     //else: just select it but don't activate as the user might
                     //      have wanted to activate another item
 

-                    // skip "processed = FALSE" below
+                    // skip "processed = false" below

                     break;
                 }
             }
 
                     break;
                 }
             }
 

-            processed = FALSE;
+            processed = false;

     }
 
     return processed;
     }
 
     return processed;


@@ -1109,10 +1143,8 @@ void wxMenu::EndRadioGroup()
     m_startRadioGroup = -1;
 }
 
     m_startRadioGroup = -1;
 }
 

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

 {
 {

-    bool check = FALSE;
-

     if ( item->GetKind() == wxITEM_RADIO )
     {
         int count = GetMenuItemCount();
     if ( item->GetKind() == wxITEM_RADIO )
     {
         int count = GetMenuItemCount();


@@ -1125,9 +1157,6 @@ bool wxMenu::DoAppend(wxMenuItem *item)
             // for now it has just one element
             item->SetAsRadioGroupStart();
             item->SetRadioGroupEnd(m_startRadioGroup);
             // for now it has just one element
             item->SetAsRadioGroupStart();
             item->SetRadioGroupEnd(m_startRadioGroup);

-
-            // ensure that we have a checked item in the radio group
-            check = TRUE;

         }
         else // extend the current radio group
         {
         }
         else // extend the current radio group
         {


@@ -1151,21 +1180,21 @@ bool wxMenu::DoAppend(wxMenuItem *item)
     }
 
     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)


@@ -1216,10 +1245,10 @@ void wxMenu::Detach()
 
 wxWindow *wxMenu::GetRootWindow() const
 {
 
 wxWindow *wxMenu::GetRootWindow() const
 {

-    if ( m_menuBar )
+    if ( GetMenuBar() )

     {
         // simple case - a normal menu attached to the menubar
     {
         // simple case - a normal menu attached to the menubar

-        return m_menuBar;
+        return GetMenuBar();

     }
 
     // we're a popup menu but the trouble is that only the top level popup menu
     }
 
     // we're a popup menu but the trouble is that only the top level popup menu


@@ -1238,7 +1267,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;


@@ -1249,7 +1278,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;


@@ -1299,7 +1328,7 @@ void wxMenu::OnDismiss(bool dismissParent)
         wxPopupMenuWindow *win = m_menuParent->m_popupMenu;
         if ( win )
         {
         wxPopupMenuWindow *win = m_menuParent->m_popupMenu;
         if ( win )
         {

-            win->OnSubmenuDismiss();
+            win->OnSubmenuDismiss( true );

         }
         else
         {
         }
         else
         {


@@ -1311,7 +1340,7 @@ void wxMenu::OnDismiss(bool dismissParent)
         {
             // dismissParent is recursive
             m_menuParent->Dismiss();
         {
             // dismissParent is recursive
             m_menuParent->Dismiss();

-            m_menuParent->OnDismiss(TRUE);
+            m_menuParent->OnDismiss(true);

         }
     }
     else // no parent menu
         }
     }
     else // no parent menu


@@ -1326,7 +1355,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);
         }


@@ -1346,7 +1375,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());


@@ -1377,7 +1406,7 @@ void wxMenu::Dismiss()
 
 bool wxMenu::ProcessKeyDown(int key)
 {
 
 bool wxMenu::ProcessKeyDown(int key)
 {

-    wxCHECK_MSG( m_popupMenu, FALSE,
+    wxCHECK_MSG( m_popupMenu, false,

                  _T("can't process key events if not shown") );
 
     return m_popupMenu->ProcessKeyDown(key);
                  _T("can't process key events if not shown") );
 
     return m_popupMenu->ProcessKeyDown(key);


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

-    
+

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


@@ -1428,12 +1457,12 @@ bool wxMenu::ProcessAccelEvent(const wxKeyEvent& event)
             // try its elements
             if ( item->GetSubMenu()->ProcessAccelEvent(event) )
             {
             // try its elements
             if ( item->GetSubMenu()->ProcessAccelEvent(event) )
             {

-                return TRUE;
+                return true;

             }
         }
     }
 
             }
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxMenu::AddAccelFor(wxMenuItem *item)
 }
 
 void wxMenu::AddAccelFor(wxMenuItem *item)


@@ -1475,10 +1504,12 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
     m_posY =
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
 {
     m_posY =

-    m_height = -1;
+    m_height = wxDefaultCoord;

 
     m_radioGroup.start = -1;
 
     m_radioGroup.start = -1;

-    m_isRadioGroupStart = FALSE;
+    m_isRadioGroupStart = false;
+
+    m_bmpDisabled = wxNullBitmap;

 
     UpdateAccelInfo();
 }
 
     UpdateAccelInfo();
 }


@@ -1609,7 +1640,7 @@ void wxMenuItem::Check(bool check)
         {
             if ( n != pos )
             {
         {
             if ( n != pos )
             {

-                node->GetData()->m_isChecked = FALSE;
+                node->GetData()->m_isChecked = false;

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


@@ -1625,7 +1656,7 @@ void wxMenuItem::Check(bool check)
 
 void wxMenuItem::SetAsRadioGroupStart()
 {
 
 void wxMenuItem::SetAsRadioGroupStart()
 {

-    m_isRadioGroupStart = TRUE;
+    m_isRadioGroupStart = true;

 }
 
 void wxMenuItem::SetRadioGroupStart(int start)
 }
 
 void wxMenuItem::SetRadioGroupStart(int start)


@@ -1656,9 +1687,15 @@ void wxMenuBar::Init()
 
     m_menuShown = NULL;
 
 
     m_menuShown = NULL;
 

-    m_shouldShowMenu = FALSE;
-    
-    m_windowStyle |= wxNO_FULL_REPAINT_ON_RESIZE;
+    m_shouldShowMenu = false;
+}
+
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
+{
+    Init();
+
+    for (size_t i = 0; i < n; ++i )
+        Append(menus[i], titles[i]);

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


@@ -1682,14 +1719,14 @@ void wxMenuBar::Attach(wxFrame *frame)
     else // not created yet, do it now
     {
         // we have no way to return the error from here anyhow :-(
     else // not created yet, do it now
     {
         // we have no way to return the error from here anyhow :-(

-        (void)Create(frame, -1);
+        (void)Create(frame, wxID_ANY);

 
         SetCursor(wxCURSOR_ARROW);
 
         SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
 
         // calculate and set our height (it won't be changed any more)
 
         SetCursor(wxCURSOR_ARROW);
 
         SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
 
         // calculate and set our height (it won't be changed any more)

-        SetSize(-1, GetBestSize().y);
+        SetSize(wxDefaultCoord, GetBestSize().y);

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


@@ -1724,14 +1761,14 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )

-        return FALSE;
+        return false;

 
     wxMenuInfo *info = new wxMenuInfo(title);
     m_menuInfos.Insert(info, pos);
 
     RefreshAllItemsAfter(pos);
 
 
     wxMenuInfo *info = new wxMenuInfo(title);
     m_menuInfos.Insert(info, pos);
 
     RefreshAllItemsAfter(pos);
 

-    return TRUE;
+    return true;

 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)


@@ -1795,7 +1832,7 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
 
 bool wxMenuBar::IsEnabledTop(size_t pos) const
 {
 
 bool wxMenuBar::IsEnabledTop(size_t pos) const
 {

-    wxCHECK_MSG( pos < GetCount(), FALSE, _T("invalid index in IsEnabledTop") );
+    wxCHECK_MSG( pos < GetCount(), false, _T("invalid index in IsEnabledTop") );

 
     return m_menuInfos[pos].IsEnabled();
 }
 
     return m_menuInfos[pos].IsEnabled();
 }


@@ -1815,7 +1852,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 
 wxString wxMenuBar::GetLabelTop(size_t pos) const
 {
 
 wxString wxMenuBar::GetLabelTop(size_t pos) const
 {

-    wxCHECK_MSG( pos < GetCount(), _T(""), _T("invalid index in GetLabelTop") );
+    wxCHECK_MSG( pos < GetCount(), wxEmptyString, _T("invalid index in GetLabelTop") );

 
     return m_menuInfos[pos].GetLabel();
 }
 
     return m_menuInfos[pos].GetLabel();
 }


@@ -2006,7 +2043,7 @@ void wxMenuBar::DoSelectMenu(size_t pos)
         if ( IsShowingMenu() )
         {
             // restore m_shouldShowMenu flag after DismissMenu() which resets
         if ( IsShowingMenu() )
         {
             // restore m_shouldShowMenu flag after DismissMenu() which resets

-            // it to FALSE
+            // it to false

             bool old = m_shouldShowMenu;
 
             DismissMenu();
             bool old = m_shouldShowMenu;
 
             DismissMenu();


@@ -2075,14 +2112,14 @@ void wxMenuBar::OnLeftDown(wxMouseEvent& event)
         }
         else // on item
         {
         }
         else // on item
         {

-               wxLogTrace(_T("mousecapture"), _T("Capturing mouse from wxMenuBar::OnLeftDown"));
+            wxLogTrace(_T("mousecapture"), _T("Capturing mouse from wxMenuBar::OnLeftDown"));

             CaptureMouse();
 
             // show it as selected
             RefreshItem((size_t)m_current);
 
             // show the menu
             CaptureMouse();
 
             // show it as selected
             RefreshItem((size_t)m_current);
 
             // show the menu

-            PopupCurrentMenu(FALSE /* don't select first item - as Windows does */);
+            PopupCurrentMenu(false /* don't select first item - as Windows does */);

         }
     }
 }
         }
     }
 }


@@ -2109,7 +2146,7 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
     static wxPoint s_ptLast;
     if ( pt == s_ptLast )
     {
     static wxPoint s_ptLast;
     if ( pt == s_ptLast )
     {

-        return FALSE;
+        return false;

     }
 
     s_ptLast = pt;
     }
 
     s_ptLast = pt;


@@ -2118,7 +2155,7 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
     int currentNew = GetMenuFromPoint(pt);
     if ( (currentNew == -1) || (currentNew == m_current) )
     {
     int currentNew = GetMenuFromPoint(pt);
     if ( (currentNew == -1) || (currentNew == m_current) )
     {

-        return FALSE;
+        return false;

     }
 
     // select the new active item
     }
 
     // select the new active item


@@ -2129,10 +2166,10 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
     if ( m_shouldShowMenu && !m_menuShown)
     {
         // open the new menu if the old one we closed had been opened
     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 */);
+        PopupCurrentMenu(false /* don't select first item - as Windows does */);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxMenuBar::OnKeyDown(wxKeyEvent& event)
 }
 
 void wxMenuBar::OnKeyDown(wxKeyEvent& event)


@@ -2168,7 +2205,7 @@ void wxMenuBar::OnKeyDown(wxKeyEvent& event)
     // the menu when up/down one is
     switch ( key )
     {
     // the menu when up/down one is
     switch ( key )
     {

-        case WXK_MENU:
+        case WXK_ALT:

             // Alt must be processed at wxWindow level too
             event.Skip();
             // fall through
             // Alt must be processed at wxWindow level too
             event.Skip();
             // fall through


@@ -2276,7 +2313,7 @@ void wxMenuBar::OnKeyDown(wxKeyEvent& event)
 
 int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 {
 
 int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 {

-    if ( !wxIsalnum(key) )
+    if ( !wxIsalnum((wxChar)key) )

     {
         // we only support letters/digits as accels
         return -1;
     {
         // we only support letters/digits as accels
         return -1;


@@ -2284,10 +2321,10 @@ int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 
     // do we have more than one item with this accel?
     if ( unique )
 
     // do we have more than one item with this accel?
     if ( unique )

-        *unique = TRUE;
+        *unique = true;

 
     // translate everything to lower case before comparing
 
     // translate everything to lower case before comparing

-    wxChar chAccel = wxTolower(key);
+    wxChar chAccel = (wxChar)wxTolower(key);

 
     // the index of the item with this accel
     int idxFound = -1;
 
     // the index of the item with this accel
     int idxFound = -1;


@@ -2324,7 +2361,7 @@ int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
             else // we already had found such item
             {
                 if ( unique )
             else // we already had found such item
             {
                 if ( unique )

-                    *unique = FALSE;
+                    *unique = false;

 
                 // no need to continue further, we won't find
                 // anything we don't already know
 
                 // no need to continue further, we won't find
                 // anything we don't already know


@@ -2365,13 +2402,13 @@ bool wxMenuBar::ProcessAccelEvent(const wxKeyEvent& event)
             if ( node->GetData()->ProcessAccelEvent(event) )
             {
                 // menu processed it
             if ( node->GetData()->ProcessAccelEvent(event) )
             {
                 // menu processed it

-                return TRUE;
+                return true;

             }
         }
     }
 
     // not found
             }
         }
     }
 
     // not found

-    return FALSE;
+    return false;

 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL


@@ -2388,7 +2425,7 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
     wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menus at once!") );
 
     // in any case, we should show it - even if we won't
     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;
+    m_shouldShowMenu = true;

 
     if ( IsEnabledTop(m_current) )
     {
 
     if ( IsEnabledTop(m_current) )
     {


@@ -2403,6 +2440,8 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);
 
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);
 

+            m_menuShown->SetInvokingWindow(m_frameLast);
+

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


@@ -2426,7 +2465,7 @@ void wxMenuBar::DismissMenu()
 
 void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 {
 
 void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 {

-    m_shouldShowMenu = FALSE;
+    m_shouldShowMenu = false;

     m_menuShown = NULL;
     if ( dismissMenuBar )
     {
     m_menuShown = NULL;
     if ( dismissMenuBar )
     {


@@ -2436,11 +2475,8 @@ void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 
 void wxMenuBar::OnDismiss()
 {
 
 void wxMenuBar::OnDismiss()
 {

-    if ( GetCapture() )
-    {
+    if ( ReleaseMouseCapture() )

         wxLogTrace(_T("mousecapture"), _T("Releasing mouse from wxMenuBar::OnDismiss"));
         wxLogTrace(_T("mousecapture"), _T("Releasing mouse from wxMenuBar::OnDismiss"));

-        GetCapture()->ReleaseMouse();
-    }

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


@@ -2453,6 +2489,42 @@ void wxMenuBar::OnDismiss()
     GiveAwayFocus();
 }
 
     GiveAwayFocus();
 }
 

+bool wxMenuBar::ReleaseMouseCapture()
+{
+#if __WXX11__
+    // With wxX11, when a menu is closed by clicking away from it, a control
+    // under the click will still get an event, even though the menu has the
+    // capture (bug?). So that control may already have taken the capture by
+    // this point, preventing us from releasing the menu's capture. So to work
+    // around this, we release both captures, then put back the control's
+    // capture.
+    wxWindow *capture = GetCapture();
+    if ( capture )
+    {
+        capture->ReleaseMouse();
+
+        if ( capture == this )
+            return true;
+
+        bool had = HasCapture();
+
+        if ( had )
+            ReleaseMouse();
+
+        capture->CaptureMouse();
+
+        return had;
+    }
+#else
+    if ( HasCapture() )
+    {
+        ReleaseMouse();
+        return true;
+    }
+#endif
+    return false;
+}
+

 void wxMenuBar::GiveAwayFocus()
 {
     GetFrame()->SetFocus();
 void wxMenuBar::GiveAwayFocus()
 {
     GetFrame()->SetFocus();


@@ -2466,7 +2538,7 @@ wxEventLoop *wxWindow::ms_evtLoopPopup = NULL;
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

-    wxCHECK_MSG( !ms_evtLoopPopup, FALSE,
+    wxCHECK_MSG( !ms_evtLoopPopup, false,

                  _T("can't show more than one popup menu at a time") );
 
 #ifdef __WXMSW__
                  _T("can't show more than one popup menu at a time") );
 
 #ifdef __WXMSW__


@@ -2493,10 +2565,10 @@ 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));
+
+    menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0));

 
     // this is not very useful if the menu was popped up because of the mouse
     // click but I think it is nice to do when it appears because of a key
 
     // this is not very useful if the menu was popped up because of the mouse
     // click but I think it is nice to do when it appears because of a key


@@ -2516,7 +2588,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     ms_evtLoopPopup = NULL;
 
     // remove the handler
     ms_evtLoopPopup = NULL;
 
     // remove the handler

-    PopEventHandler(TRUE /* delete it */);
+    PopEventHandler(true /* delete it */);

 
     menu->SetInvokingWindow(NULL);
 
 
     menu->SetInvokingWindow(NULL);
 


@@ -2524,13 +2596,13 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     SetCursor(cursorOld);
 #endif // __WXMSW__
 
     SetCursor(cursorOld);
 #endif // __WXMSW__
 

-    return TRUE;
+    return true;

 }
 
 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();
 }