diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-25 13:15:27 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:33:41 +0100 |
| commit | fe01794cbf3e2c15db22d4013b0fb6f1c44625cd (patch) | |
| tree | 3edff2c75bc0d7f1fc2a1570a2cb918fe99eeb7f /include | |
| parent | 90ffbc8582ec1a6edc647b8ab222e60e6dedc66f (diff) | |
Integrate branch of IAccessible2
Change-Id: I8c2fea0367ebfa53ce5e109ef48fd661cbfb78b3
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/combobox.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/lstbox.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/menu.hxx | 9 |
3 files changed, 15 insertions, 3 deletions
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 6f9c5343ea0f..76533ab7ce16 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -74,6 +74,7 @@ private: DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* ); DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* ); protected: using Window::ImplInit; @@ -178,8 +179,8 @@ public: void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep = ';' ); OUString GetMRUEntries( sal_Unicode cSep = ';' ) const; void SetMaxMRUCount( sal_uInt16 n ); - sal_uInt16 GetMaxMRUCount() const; - + sal_uInt16 GetMaxMRUCount() const; + sal_uInt16 GetMRUCount() const; void SetEntryData( sal_uInt16 nPos, void* pNewData ); void* GetEntryData( sal_uInt16 nPos ) const; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 6b3ab8c105dd..cc63c2fdd452 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -63,7 +63,8 @@ private: DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* ); - + DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, void* ); protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); @@ -198,6 +199,7 @@ public: Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; + sal_uInt16 GetMRUCount() const; sal_uInt16 GetDisplayLineCount() const; void EnableMirroring(); diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 637c701171e9..513187233039 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -134,6 +134,8 @@ private: sal_uInt16 nDefaultItem; // Id of default item sal_uInt16 nSelectedId; + sal_uInt16 nHighlightedItem; + // for output: sal_uInt16 nImgOrChkPos; sal_uInt16 nTextPos; @@ -234,6 +236,13 @@ public: sal_uInt16 GetCurItemId() const; OString GetCurItemIdent() const; + void SetHightlightItem(sal_uInt16 nHighlightedItem); + sal_uInt16 GetHighlightItem() const; + + OUString GetItemAccKeyStrFromPos(sal_uInt16 nPos) const; + + sal_Bool IsTemporaryItemFromPos(sal_uInt16 nPos) const; + void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } sal_uInt16 GetDefaultItem() const { return nDefaultItem; } |