diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 13:09:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-24 14:56:13 +0000 |
| commit | 6f71fa11c0b1c5a9683c43bc98acec57a4d53610 (patch) | |
| tree | c5a47c553a02003903e2c98be64f249fde3678a4 /include | |
| parent | 32cbe7125387397bf269fb6ca83c11cf66f9d543 (diff) | |
vcl makes no use of menu Get/Set DefaultItem
this is exposed through uno however, so move it into VCLXMenu to continue to
support it doing nothing of great value there
Change-Id: I6888e61cbec85faa2d1fcca8731ab42023e594c6
Diffstat (limited to 'include')
| -rw-r--r-- | include/toolkit/awt/vclxmenu.hxx | 1 | ||||
| -rw-r--r-- | include/tools/rc.h | 3 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 77dc70911e02..91d088ac492b 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -63,6 +63,7 @@ private: VclPtr<Menu> mpMenu; MenuListenerMultiplexer maMenuListeners; PopupMenuRefList maPopupMenuRefs; + sal_Int16 mnDefaultItem; protected: ::osl::Mutex& GetMutex() { return maMutex; } diff --git a/include/tools/rc.h b/include/tools/rc.h index aa9f24ab7a9f..c1da806985d2 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -29,10 +29,9 @@ enum class RscMenu { Items = 0x01, Text = 0x02, - DefaultItemId = 0x04 }; namespace o3tl { - template<> struct typed_flags<RscMenu> : is_typed_flags<RscMenu, 0x07> {}; + template<> struct typed_flags<RscMenu> : is_typed_flags<RscMenu, 0x03> {}; } // "MenuItem" resource options: diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 959d54d9f118..313ae5384f9d 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -150,7 +150,6 @@ private: ImplSVEvent* nEventId; sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item MenuFlags nMenuFlags; - sal_uInt16 nDefaultItem; // Id of default item sal_uInt16 nSelectedId; // for output: @@ -271,9 +270,6 @@ public: sal_uInt16 GetCurItemId() const { return nSelectedId;} OString GetCurItemIdent() const; - void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } - sal_uInt16 GetDefaultItem() const { return nDefaultItem; } - void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; |