A few tweaks and cleanups

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 26a12fecfdc421b20e01b294f38d9e57e2fc4c6f..5f4ba30bb47daf25c52bb280980860776790cde6 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -113,6 +113,7 @@ static wxString TextToLabel(const wxString& rTitle)
 void wxMenu::Init()
 {
     m_bDoBreak = FALSE;
 void wxMenu::Init()
 {
     m_bDoBreak = FALSE;

+    m_nStartRadioGroup = -1;

 
     //
     // Create the menu (to be used as a submenu or a popup)
 
     //
     // Create the menu (to be used as a submenu or a popup)


@@ -174,9 +175,7 @@ wxMenu::~wxMenu()
     //
     // Delete accels
     //
     //
     // Delete accels
     //

-#if (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))

     WX_CLEAR_ARRAY(m_vAccels);
     WX_CLEAR_ARRAY(m_vAccels);

-#endif

 #endif // wxUSE_ACCEL
 } // end of wxMenu::~wxMenu
 
 #endif // wxUSE_ACCEL
 } // end of wxMenu::~wxMenu
 


@@ -186,15 +185,15 @@ void wxMenu::Break()
     m_bDoBreak = TRUE;
 } // end of wxMenu::Break
 
     m_bDoBreak = TRUE;
 } // end of wxMenu::Break
 

-#if wxUSE_ACCEL
-
-void wxMenu::EndRadioGroup()
+void wxMenu::Attach(
+  wxMenuBarBase*                    pMenubar
+)

 {
 {

-    //
-    // We're not inside a radio group any longer
-    //
-    m_nStartRadioGroup = -1;
-} // end of wxMenu::EndRadioGroup
+    wxMenuBase::Attach(pMenubar);
+    EndRadioGroup();
+} // end of wxMenu::Break;
+
+#if wxUSE_ACCEL

 
 int wxMenu::FindAccel(
   int                               nId
 
 int wxMenu::FindAccel(
   int                               nId


@@ -204,10 +203,8 @@ int wxMenu::FindAccel(
     size_t                          nCount = m_vAccels.GetCount();
 
     for (n = 0; n < nCount; n++)
     size_t                          nCount = m_vAccels.GetCount();
 
     for (n = 0; n < nCount; n++)

-    {

         if (m_vAccels[n]->m_command == nId)
             return n;
         if (m_vAccels[n]->m_command == nId)
             return n;

-    }

     return wxNOT_FOUND;
 } // end of wxMenu::FindAccel
 
     return wxNOT_FOUND;
 } // end of wxMenu::FindAccel
 


@@ -232,13 +229,14 @@ void wxMenu::UpdateAccel(
         // Find the (new) accel for this item
         //
         wxAcceleratorEntry*         pAccel = wxGetAccelFromString(pItem->GetText());
         // Find the (new) accel for this item
         //
         wxAcceleratorEntry*         pAccel = wxGetAccelFromString(pItem->GetText());

+

         if (pAccel)
             pAccel->m_command = pItem->GetId();
 
         //
         // Find the old one
         //
         if (pAccel)
             pAccel->m_command = pItem->GetId();
 
         //
         // Find the old one
         //

-        int                             n = FindAccel(pItem->GetId());
+        size_t                      n = FindAccel(pItem->GetId());

 
         if (n == wxNOT_FOUND)
         {
 
         if (n == wxNOT_FOUND)
         {


@@ -248,15 +246,14 @@ void wxMenu::UpdateAccel(
             if (pAccel)
                 m_vAccels.Add(pAccel);
             else
             if (pAccel)
                 m_vAccels.Add(pAccel);
             else

-                return;     // skipping RebuildAccelTable() below
+                return;

         }
         else
         {
             //
             // Replace old with new or just remove the old one if no new
             //
         }
         else
         {
             //
             // Replace old with new or just remove the old one if no new
             //

-            delete                      m_vAccels[n];
-
+            delete m_vAccels[n];

             if (pAccel)
                 m_vAccels[n] = pAccel;
             else
             if (pAccel)
                 m_vAccels[n] = pAccel;
             else


@@ -280,6 +277,10 @@ bool wxMenu::DoInsertOrAppend(
 , size_t                            nPos
 )
 {
 , size_t                            nPos
 )
 {

+    wxMenu*                         pSubmenu = pItem->GetSubMenu();
+    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+                                            pItem->m_vMenuData;
+

     ERRORID                         vError;
     wxString                        sError;
     char                            zMsg[128];
     ERRORID                         vError;
     wxString                        sError;
     char                            zMsg[128];


@@ -292,9 +293,6 @@ bool wxMenu::DoInsertOrAppend(
     // MENUITEM for submenus as required by ::MM_INSERTITEM message API
     //
 
     // MENUITEM for submenus as required by ::MM_INSERTITEM message API
     //
 

-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
-                                            pItem->m_vMenuData;

     if(pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
     if(pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));


@@ -415,6 +413,14 @@ bool wxMenu::DoInsertOrAppend(
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 
     return FALSE;
 } // end of wxMenu::DoInsertOrAppend
 

+void wxMenu::EndRadioGroup()
+{
+    //
+    // We're not inside a radio group any longer
+    //
+    m_nStartRadioGroup = -1;
+} // end of wxMenu::EndRadioGroup
+

 bool wxMenu::DoAppend(
   wxMenuItem*                       pItem
 )
 bool wxMenu::DoAppend(
   wxMenuItem*                       pItem
 )


@@ -451,6 +457,7 @@ bool wxMenu::DoAppend(
             // We need to update its end item
             //
             pItem->SetRadioGroupStart(m_nStartRadioGroup);
             // We need to update its end item
             //
             pItem->SetRadioGroupStart(m_nStartRadioGroup);

+

             wxMenuItemList::Node*   pNode = GetMenuItems().Item(m_nStartRadioGroup);
 
             if (pNode)
             wxMenuItemList::Node*   pNode = GetMenuItems().Item(m_nStartRadioGroup);
 
             if (pNode)


@@ -467,16 +474,20 @@ bool wxMenu::DoAppend(
     {
         EndRadioGroup();
     }
     {
         EndRadioGroup();
     }

+

     if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
     {
         return FALSE;
     }
     if (bCheck)
     {
     if (!wxMenuBase::DoAppend(pItem) || !DoInsertOrAppend(pItem))
     {
         return FALSE;
     }
     if (bCheck)
     {

+        //
+        // Check the item initially
+        //

         pItem->Check(TRUE);
     }
     return TRUE;
         pItem->Check(TRUE);
     }
     return TRUE;

-} // end of wxMenu::DoInsert
+} // end of wxMenu::DoAppend

 
 bool wxMenu::DoInsert(
   size_t                            nPos
 
 bool wxMenu::DoInsert(
   size_t                            nPos


@@ -487,7 +498,8 @@ bool wxMenu::DoInsert(
                                   ,pItem) &&
              DoInsertOrAppend( pItem
                               ,nPos
                                   ,pItem) &&
              DoInsertOrAppend( pItem
                               ,nPos

-                             ));
+                             )
+           );

 } // end of wxMenu::DoInsert
 
 wxMenuItem* wxMenu::DoRemove(
 } // end of wxMenu::DoInsert
 
 wxMenuItem* wxMenu::DoRemove(


@@ -1098,7 +1110,7 @@ void wxMenuBar::Attach(
   wxFrame*                          pFrame
 )
 {
   wxFrame*                          pFrame
 )
 {

-    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
+    wxMenuBarBase::Attach(pFrame);

 
 #if wxUSE_ACCEL
     RebuildAccelTable();
 
 #if wxUSE_ACCEL
     RebuildAccelTable();


@@ -1106,8 +1118,8 @@ void wxMenuBar::Attach(
     // Ensure the accelerator table is set to the frame (not the client!)
     //
     if (!::WinSetAccelTable( vHabmain
     // Ensure the accelerator table is set to the frame (not the client!)
     //
     if (!::WinSetAccelTable( vHabmain

-                            ,(HWND)pFrame->GetHWND()

                             ,m_vAccelTable.GetHACCEL()
                             ,m_vAccelTable.GetHACCEL()

+                            ,(HWND)pFrame->GetFrame()

                            ))
         wxLogLastError("WinSetAccelTable");
 #endif // wxUSE_ACCEL
                            ))
         wxLogLastError("WinSetAccelTable");
 #endif // wxUSE_ACCEL