fdo#84938: replace MIB_ constants with enum

Change-Id: I58c1b4c9e4c4b3751b233d2fe10b9c953b945c4a
Reviewed-on: https://gerrit.libreoffice.org/12179
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 34 insertions, 34 deletions

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index b28b4ca030b3..8c58442ba063 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1448,7 +1448,7 @@ void TabControl::Command( const CommandEvent& rCEvt )
             for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
                  it != mpTabCtrlData->maItemList.end(); ++it )
             {
-                aMenu.InsertItem( it->mnId, it->maText, MIB_CHECKABLE );
+                aMenu.InsertItem( it->mnId, it->maText, MenuItemBits::CHECKABLE );
                 if ( it->mnId == mnCurPageId )
                     aMenu.CheckItem( it->mnId );
                 aMenu.SetHelpId( it->mnId, it->maHelpId );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index f8fad60ec7c9..68f5c9dc5181 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2711,7 +2711,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, const OString &rClass, con
     if (rClass == "GtkMenuItem")
     {
         OUString sLabel(OStringToOUString(convertMnemonicMarkup(extractLabel(rProps)), RTL_TEXTENCODING_UTF8));
-        pParent->InsertItem(nNewId, sLabel, MIB_TEXT, rID);
+        pParent->InsertItem(nNewId, sLabel, MenuItemBits::TEXT, rID);
     }
     else if (rClass == "GtkSeparatorMenuItem")
     {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 5ec2aa4d7418..c65930cc655f 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -184,13 +184,13 @@ void Menu::CreateAutoMnemonics()
     for ( n = 0; n < pItemList->size(); n++ )
     {
         MenuItemData* pData = pItemList->GetDataFromPos( n );
-        if ( ! (pData->nBits & MIB_NOSELECT ) )
+        if ( ! (pData->nBits & MenuItemBits::NOSELECT ) )
             aMnemonicGenerator.RegisterMnemonic( pData->aText );
     }
     for ( n = 0; n < pItemList->size(); n++ )
     {
         MenuItemData* pData = pItemList->GetDataFromPos( n );
-        if ( ! (pData->nBits & MIB_NOSELECT ) )
+        if ( ! (pData->nBits & MenuItemBits::NOSELECT ) )
             pData->aText = aMnemonicGenerator.CreateMnemonic( pData->aText );
     }
 }
@@ -276,10 +276,10 @@ void Menu::Highlight()
 void Menu::ImplSelect()
 {
     MenuItemData* pData = GetItemList()->GetData( nSelectedId );
-    if ( pData && (pData->nBits & MIB_AUTOCHECK) )
+    if ( pData && (pData->nBits & MenuItemBits::AUTOCHECK) )
     {
         bool bChecked = IsItemChecked( nSelectedId );
-        if ( pData->nBits & MIB_RADIOCHECK )
+        if ( pData->nBits & MenuItemBits::RADIOCHECK )
         {
             if ( !bChecked )
                 CheckItem( nSelectedId, true );
@@ -434,7 +434,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos )
     if ( nObjMask & RSC_MENUITEM_ID )
         nItemId = sal::static_int_cast<sal_uInt16>(ReadLongRes());
 
-    MenuItemBits nStatus = 0;
+    MenuItemBits nStatus = MenuItemBits::NONE;
     if ( nObjMask & RSC_MENUITEM_STATUS )
         nStatus = sal::static_int_cast<MenuItemBits>(ReadLongRes());
 
@@ -745,7 +745,7 @@ void Menu::SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits )
 
 MenuItemBits Menu::GetItemBits( sal_uInt16 nItemId ) const
 {
-    MenuItemBits nBits = 0;
+    MenuItemBits nBits = MenuItemBits::NONE;
     MenuItemData* pData = pItemList->GetData( nItemId );
     if ( pData )
         nBits = pData->nBits;
@@ -869,8 +869,8 @@ void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck )
         return;
 
     // if radio-check, then uncheck previous
-    if ( bCheck && (pData->nBits & MIB_AUTOCHECK) &&
-         (pData->nBits & MIB_RADIOCHECK) )
+    if ( bCheck && (pData->nBits & MenuItemBits::AUTOCHECK) &&
+         (pData->nBits & MenuItemBits::RADIOCHECK) )
     {
         MenuItemData*   pGroupData;
         sal_uInt16          nGroupPos;
@@ -881,7 +881,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck )
         while ( nGroupPos )
         {
             pGroupData = pItemList->GetDataFromPos( nGroupPos-1 );
-            if ( pGroupData->nBits & MIB_RADIOCHECK )
+            if ( pGroupData->nBits & MenuItemBits::RADIOCHECK )
             {
                 if ( IsItemChecked( pGroupData->nId ) )
                 {
@@ -901,7 +901,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck )
             while ( nGroupPos < nItemCount )
             {
                 pGroupData = pItemList->GetDataFromPos( nGroupPos );
-                if ( pGroupData->nBits & MIB_RADIOCHECK )
+                if ( pGroupData->nBits & MenuItemBits::RADIOCHECK )
                 {
                     if ( IsItemChecked( pGroupData->nId ) )
                     {
@@ -1342,7 +1342,7 @@ bool Menu::ImplIsSelectable( sal_uInt16 nPos ) const
 
     MenuItemData* pData = pItemList->GetDataFromPos( nPos );
     // check general visibility first
-    if ( pData && ( pData->nBits & MIB_NOSELECT ) )
+    if ( pData && ( pData->nBits & MenuItemBits::NOSELECT ) )
         bSelectable = false;
 
     return bSelectable;
@@ -1863,11 +1863,11 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                     if( ! ( ( pData->eType == MenuItemType::IMAGE ) || ( pData->eType == MenuItemType::STRINGIMAGE ) ) )
                     {
                         if ( pWin->IsNativeControlSupported( CTRL_MENU_POPUP,
-                                                             (pData->nBits & MIB_RADIOCHECK)
+                                                             (pData->nBits & MenuItemBits::RADIOCHECK)
                                                              ? PART_MENU_ITEM_CHECK_MARK
                                                              : PART_MENU_ITEM_RADIO_MARK ) )
                         {
-                            ControlPart nPart = ((pData->nBits & MIB_RADIOCHECK)
+                            ControlPart nPart = ((pData->nBits & MenuItemBits::RADIOCHECK)
                                                  ? PART_MENU_ITEM_RADIO_MARK
                                                  : PART_MENU_ITEM_CHECK_MARK);
 
@@ -1882,7 +1882,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                             if ( bHighlighted )
                                 nState |= CTRL_STATE_SELECTED;
 
-                            long nCtrlHeight = (pData->nBits & MIB_RADIOCHECK) ? nCheckHeight : nRadioHeight;
+                            long nCtrlHeight = (pData->nBits & MenuItemBits::RADIOCHECK) ? nCheckHeight : nRadioHeight;
                             aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - nCtrlHeight)/2;
                             aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
 
@@ -1903,7 +1903,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
 
                             SymbolType eSymbol;
                             Size aSymbolSize;
-                            if ( pData->nBits & MIB_RADIOCHECK )
+                            if ( pData->nBits & MenuItemBits::RADIOCHECK )
                             {
                                 eSymbol = SymbolType::RADIOCHECKMARK;
                                 aSymbolSize = Size( nFontHeight/2, nFontHeight/2 );
@@ -2035,7 +2035,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                         aTmpPos.Y() = aPos.Y();
                         aTmpPos.Y() += nExtra/2;
                         aTmpPos.Y() += ( pData->aSz.Height() / 2 ) - ( nFontHeight/4 );
-                        if ( pData->nBits & MIB_POPUPSELECT )
+                        if ( pData->nBits & MenuItemBits::POPUPSELECT )
                         {
                             pWin->SetTextColor( rSettings.GetMenuTextColor() );
                             Point aTmpPos2( aPos );
@@ -2862,7 +2862,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_
         {
             OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
             MenuItemData* pData = pItemList->Insert(
-                0xFFFF, MenuItemType::STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() );
+                0xFFFF, MenuItemType::STRING, MenuItemBits::NONE, aTmpEntryText, Image(), NULL, 0xFFFF, OString() );
             size_t nPos = 0;
             pData = pItemList->GetData( pData->nId, nPos );
             assert(pData);
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 5b0ed083d23e..c83eddebf577 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -177,7 +177,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow
                 if ( ( nOldY <= nMouseY ) && ( nY > nMouseY ) && pMenu->ImplIsSelectable( n ) )
                 {
                     bool bPopupArea = true;
-                    if ( pItemData->nBits & MIB_POPUPSELECT )
+                    if ( pItemData->nBits & MenuItemBits::POPUPSELECT )
                     {
                         // only when clicked over the arrow...
                         Size aSz = GetOutputSizePixel();
@@ -212,7 +212,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow
                         {
                             ChangeHighlightItem( (sal_uInt16)n, true );
                         }
-                        else if ( pItemData->nBits & MIB_POPUPSELECT )
+                        else if ( pItemData->nBits & MenuItemBits::POPUPSELECT )
                         {
                             if ( bPopupArea && ( pActivePopup != pItemData->pSubMenu ) )
                                 HighlightChanged( NULL );
@@ -507,7 +507,7 @@ void MenuFloatingWindow::MouseButtonUp( const MouseEvent& rMEvt )
         {
             EndExecute();
         }
-        else if ( ( pData->nBits & MIB_POPUPSELECT ) && ( nHighlightedItem == _nMBDownPos ) && ( rMEvt.GetClicks() == 2 ) )
+        else if ( ( pData->nBits & MenuItemBits::POPUPSELECT ) && ( nHighlightedItem == _nMBDownPos ) && ( rMEvt.GetClicks() == 2 ) )
         {
             // not when clicked over the arrow...
             Size aSz = GetOutputSizePixel();
@@ -738,7 +738,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight )
                 bool bDrawItemRect = true;
 
                 Rectangle aItemRect( Point( nX+nOuterSpaceX, nY ), Size( aSz.Width()-2*nOuterSpaceX, pData->aSz.Height() ) );
-                if ( pData->nBits & MIB_POPUPSELECT )
+                if ( pData->nBits & MenuItemBits::POPUPSELECT )
                 {
                     long nFontHeight = GetTextHeight();
                     aItemRect.Right() -= nFontHeight + nFontHeight/4;
@@ -827,7 +827,7 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos )
             if ( pData->eType != MenuItemType::SEPARATOR )
             {
                 aRect = Rectangle( Point( nX, nY ), Size( aSz.Width(), pData->aSz.Height() ) );
-                if ( pData->nBits & MIB_POPUPSELECT )
+                if ( pData->nBits & MenuItemBits::POPUPSELECT )
                 {
                     long nFontHeight = GetTextHeight();
                     aRect.Right() -= nFontHeight + nFontHeight/4;
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 505bdf72e98b..4fb7526982d8 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -99,7 +99,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
     pData->nId              = 0;
     pData->sIdent           = rIdent;
     pData->eType            = MenuItemType::SEPARATOR;
-    pData->nBits            = 0;
+    pData->nBits            = MenuItemBits::NONE;
     pData->pSubMenu         = NULL;
     pData->pAutoSubMenu     = NULL;
     pData->nUserValue       = 0;
@@ -113,7 +113,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
     SalItemParams aSalMIData;
     aSalMIData.nId = 0;
     aSalMIData.eType = MenuItemType::SEPARATOR;
-    aSalMIData.nBits = 0;
+    aSalMIData.nBits = MenuItemBits::NONE;
     aSalMIData.pMenu = NULL;
     aSalMIData.aText = OUString();
     aSalMIData.aImage = Image();
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index da69193770db..619e3eb89f00 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -60,7 +60,7 @@ struct MenuItemData
     MenuItemData()
         : nId(0)
         , eType(MenuItemType::DONTKNOW)
-        , nBits(0)
+        , nBits(MenuItemBits::NONE)
         , pSubMenu(NULL)
         , pAutoSubMenu(NULL)
         , nUserValue(0)
@@ -76,7 +76,7 @@ struct MenuItemData
     MenuItemData( const OUString& rStr, const Image& rImage )
         : nId(0)
         , eType(MenuItemType::DONTKNOW)
-        , nBits(0)
+        , nBits(MenuItemBits::NONE)
         , pSubMenu(NULL)
         , pAutoSubMenu(NULL)
         , aText(rStr)
@@ -94,7 +94,7 @@ struct MenuItemData
     ~MenuItemData();
     bool HasCheck() const
     {
-        return bChecked || ( nBits & ( MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK ) );
+        return bChecked || ( nBits & ( MenuItemBits::RADIOCHECK | MenuItemBits::CHECKABLE | MenuItemBits::AUTOCHECK ) );
     }
 };
 
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index fb42808e5ff0..0113b12fccd9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1840,7 +1840,7 @@ void ToolBox::UpdateCustomMenu()
             if( it->IsClipped() )
             {
                 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
-                pMenu->InsertItem( id, it->maText, it->maImage, 0, OString());
+                pMenu->InsertItem( id, it->maText, it->maImage, MenuItemBits::NONE, OString());
                 pMenu->EnableItem( id, it->mbEnabled );
                 pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE );
             }
@@ -1856,7 +1856,7 @@ void ToolBox::UpdateCustomMenu()
             if( it->IsItemHidden() )
             {
                 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
-                pMenu->InsertItem( id, it->maText, it->maImage, 0, OString() );
+                pMenu->InsertItem( id, it->maText, it->maImage, MenuItemBits::NONE, OString() );
                 pMenu->EnableItem( id, it->mbEnabled );
                 pMenu->CheckItem( id, it->meState == TRISTATE_TRUE );
             }
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 676e68c5f5a5..456c2db0e72f 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -565,7 +565,7 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItem
         GVariant *pCheckValue = NULL;
         GVariant *pCurrentState = g_action_group_get_action_state( mpActionGroup, aCommand );
 
-        if ( bits & MIB_RADIOCHECK )
+        if ( bits & MenuItemBits::RADIOCHECK )
             pCheckValue = bCheck ? g_variant_new_string( aCommand ) : g_variant_new_string( "" );
         else
         {
@@ -659,7 +659,7 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
     GVariant *pTarget = NULL;
 
     if ( g_action_group_has_action( mpActionGroup, aCommand ) == FALSE ) {
-        if ( ( nBits & MIB_CHECKABLE ) || bIsSubmenu )
+        if ( ( nBits & MenuItemBits::CHECKABLE ) || bIsSubmenu )
         {
             // Item is a checkmark button.
             GVariantType* pStateType = g_variant_type_new( (gchar*) G_VARIANT_TYPE_BOOLEAN );
@@ -667,7 +667,7 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
 
             g_lo_action_group_insert_stateful( pActionGroup, aCommand, nId, bIsSubmenu, NULL, pStateType, NULL, pState );
         }
-        else if ( nBits & MIB_RADIOCHECK )
+        else if ( nBits & MenuItemBits::RADIOCHECK )
         {
             // Item is a radio button.
             GVariantType* pParameterType = g_variant_type_new( (gchar*) G_VARIANT_TYPE_STRING );