cosmetic fixes to font encoding names

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

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 78293daafaeb6fbdc4975edbbe5bddaabd039e72..a9c390acc31d7a9f6389d6eccfeb89d69bb68d14 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -275,7 +275,7 @@ bool wxMenu::DoInsertOrAppend(
     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();
     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();

-    MENUITEM   &rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:

                                             pItem->m_vMenuData;
     if(pSubmenu != NULL)
     {
                                             pItem->m_vMenuData;
     if(pSubmenu != NULL)
     {


@@ -296,7 +296,7 @@ bool wxMenu::DoInsertOrAppend(
 
     if (pItem->IsSeparator())
     {
 
     if (pItem->IsSeparator())
     {

-        vItem.afStyle |= MIS_SEPARATOR;
+        rItem.afStyle |= MIS_SEPARATOR;

     }
 
     //
     }
 
     //


@@ -304,20 +304,18 @@ bool wxMenu::DoInsertOrAppend(
     // required by ::MM_INSERTITEM message API
     //
 
     // required by ::MM_INSERTITEM message API
     //
 

-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-

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

-        vItem.iPosition = 0; // submenus have a 0 position
-        vItem.id = (USHORT)pSubmenu->GetHMenu();
-        vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
+        rItem.iPosition = 0; // submenus have a 0 position
+        rItem.id = (USHORT)pSubmenu->GetHMenu();
+        rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;

     }
     else
     {
     }
     else
     {

-        vItem.id = pItem->GetId();
+        rItem.id = pItem->GetId();

     }
 
     BYTE*                           pData;
     }
 
     BYTE*                           pData;


@@ -340,7 +338,7 @@ bool wxMenu::DoInsertOrAppend(
         //
         // Menu is just a normal string (passed in data parameter)
         //
         //
         // Menu is just a normal string (passed in data parameter)
         //

-        vItem.afStyle |= MIS_TEXT;
+        rItem.afStyle |= MIS_TEXT;

         pData = (char*)pItem->GetText().c_str();
     }
 
         pData = (char*)pItem->GetText().c_str();
     }
 


@@ -1033,7 +1031,7 @@ 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->GetFrame()
+                            ,(HWND)pFrame->GetHWND()

                             ,m_vAccelTable.GetHACCEL()
                            ))
         wxLogLastError("WinSetAccelTable");
                             ,m_vAccelTable.GetHACCEL()
                            ))
         wxLogLastError("WinSetAccelTable");