diff options
Diffstat (limited to 'vcl/source/window/menu.cxx')
-rw-r--r-- | vcl/source/window/menu.cxx | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 6cd7e7c218bc..fb6f98203366 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tools/debug.hxx" #include "tools/diagnose_ex.h" #include "tools/rc.h" @@ -50,7 +49,6 @@ #include "salmenu.hxx" #include "salframe.hxx" - #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -81,7 +79,6 @@ struct MenuLayoutData : public ControlLayoutData using namespace ::com::sun::star; using namespace vcl; - #define ITEMPOS_INVALID 0xFFFF #define EXTRASPACEY 2 @@ -213,7 +210,6 @@ public: void InsertSeparator(const OString &rIdent, size_t nPos); void Remove( size_t nPos ); - MenuItemData* GetData( sal_uInt16 nSVId, size_t& rPos ) const; MenuItemData* GetData( sal_uInt16 nSVId ) const { @@ -240,8 +236,6 @@ public: } }; - - MenuItemList::~MenuItemList() { for( size_t i = 0, n = maItemList.size(); i < n; ++i ) @@ -477,11 +471,8 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const return nItems; } - - // - MenuFloatingWindow - - class MenuFloatingWindow : public FloatingWindow { friend void Menu::ImplFillLayoutData() const; @@ -671,13 +662,11 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) (lastSize - maImage.GetSizePixel().Height())/2 ), maImage.GetSizePixel() ); - aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc ); SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) ); } } - // a basic class for both (due to pActivePopup, Timer,...) would be nice, // but a container class should have been created then, as they // would be derived from different windows @@ -1555,7 +1544,6 @@ sal_uInt16 Menu::GetItemId(const OString &rIdent) const return MENU_ITEM_NOTFOUND; } - sal_uInt16 Menu::GetItemPos( sal_uInt16 nItemId ) const { size_t nPos; @@ -2336,8 +2324,6 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& return false; } - - void Menu::ImplAddDel( ImplMenuDelData& rDel ) { DBG_ASSERT( !rDel.mpMenu, "Menu::ImplAddDel(): cannot add ImplMenuDelData twice !" ); @@ -2349,8 +2335,6 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel ) } } - - void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) { rDel.mpMenu = NULL; @@ -2370,8 +2354,6 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) } } - - Size Menu::ImplCalcSize( const Window* pWin ) { // | Check/Radio/Image| Text| Accel/Popup| @@ -3137,7 +3119,6 @@ Rectangle Menu::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const return (mpLayoutData && nItemIndex != -1) ? mpLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle(); } - long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const { long nIndex = -1; @@ -3250,11 +3231,8 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } } - - // - MenuBar - - MenuBar::MenuBar() : Menu( true ) { mbDisplayable = true; @@ -3355,8 +3333,6 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; } - - void MenuBar::SelectEntry( sal_uInt16 nId ) { MenuBarWindow* pMenuWin = (MenuBarWindow*) ImplGetWindow(); @@ -3378,8 +3354,6 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) } } - - // handler for native menu selection and command events bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const @@ -3479,8 +3453,6 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId ); } - - // bool PopupMenu::bAnyPopupInExecute = false; PopupMenu::PopupMenu() @@ -3662,7 +3634,6 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong // #102790# context menus shall never show disabled entries nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES; - sal_uInt16 nVisibleEntries = ImplGetVisibleItemCount(); if ( !nVisibleEntries ) { @@ -3895,7 +3866,6 @@ long PopupMenu::ImplCalcHeight( sal_uInt16 nEntries ) const return nHeight; } - static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -4537,7 +4507,6 @@ void MenuFloatingWindow::ImplScroll( bool bUp ) nFirstEntry = pMenu->ImplGetNextVisible( nFirstEntry ); DBG_ASSERT( nFirstEntry != ITEMPOS_INVALID, "Scroll?!" ); - if ( !bScrollUp ) { bScrollUp = true; @@ -4791,7 +4760,6 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos ) return aRect; } - void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd ) { if( ! pMenu ) @@ -5374,7 +5342,6 @@ void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) } } - void MenuBarWindow::KillActivePopup() { if ( pActivePopup ) |