INTEGRATION: CWS dba17 (1.13.492); FILE MERGED

2004/09/30 14:51:38 fs 1.13.492.1: #ii34790# +CreateAutoMnemonics with an additional MnemonicGenerator, to share the 'mnemonic space' with other components

1 files changed, 14 insertions, 2 deletions

diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx
index 54bbeebe37e6..8dee9bce9423 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/ivctrl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ivctrl.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: vg $ $Date: 2003-05-27 11:20:56 $
+ *  last change: $Author: pjunck $ $Date: 2004-10-22 12:31:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -280,6 +280,7 @@ public:
 #define WB_HIGHLIGHTFRAME       WB_INFO
 #define WB_NOASYNCSELECTHDL     WB_NOLABEL
 
+class MnemonicGenerator;
 class SvtIconChoiceCtrl : public Control
 {
     friend class SvxIconChoiceCtrl_Impl;
@@ -358,8 +359,19 @@ public:
                                      const Point* pPos = 0,
                                      USHORT nFlags = 0 );
 
+    /** creates automatic mnemonics for all icon texts in the control
+    */
     void                CreateAutoMnemonics( void );
 
+    /** creates automatic mnemonics for all icon texts in the control
+
+    @param _rUsedMnemonics
+        a <type>MnemonicGenerator</type> at which some other mnemonics are already registered.
+        This can be used if the control needs to share the "mnemonic space" with other elements,
+        such as a menu bar.
+    */
+    void                CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
+
     void                RemoveEntry( SvxIconChoiceCtrlEntry* pEntry );
 
     BOOL                DoKeyInput( const KeyEvent& rKEvt );