INTEGRATION: CWS cd04 (1.5.50); FILE MERGED

2005/01/21 10:37:18 dbo 1.5.50.3: #i40887# fixed selection: no use of GetCurEntry() anymore
Issue number:
Submitted by:
Reviewed by:
2005/01/19 12:39:35 dbo 1.5.50.2: #i40887# selection, focus
Issue number:
Submitted by:
Reviewed by:
2005/01/19 10:17:49 dbo 1.5.50.1: #i35195##i40553#
- focus takeover
- invalid bootstraprc crash
- resmgr mutex cleanup
Issue number:
Submitted by:
Reviewed by:

1 files changed, 21 insertions, 8 deletions

diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 715af2d677ba..2c5a5a114a58 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dp_gui.h,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: hr $ $Date: 2004-11-09 14:04:55 $
+ *  last change: $Author: rt $ $Date: 2005-01-27 10:20:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,6 +104,18 @@ struct DialogImpl :
     static ResId getResId( USHORT id );
     static String getResourceString( USHORT id );
 
+    struct SelectionBoxControl : public Control
+    {
+        SelectionBoxControl( DialogImpl * dialog )
+            : Control( dialog, WB_BORDER | WB_TABSTOP ),
+              m_dialog(dialog)
+            {}
+        long Notify( NotifyEvent & rEvt );
+
+    private:
+        DialogImpl * m_dialog;
+    };
+
     struct TreeListBoxImpl : public SvHeaderTabListBox
     {
         typedef ::std::list<
@@ -124,7 +136,7 @@ struct DialogImpl :
             css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
 
         DialogImpl * m_dialog;
-        SvLBoxEntry * m_currentEntry;
+        SvLBoxEntry * m_currentSelectedEntry;
         bool m_hiContrastMode;
         Timer m_timer;
 
@@ -156,12 +168,13 @@ struct DialogImpl :
         virtual ~TreeListBoxImpl();
         TreeListBoxImpl( Window * pParent, DialogImpl * dialog );
 
-        bool isFirstLevelChild( SvLBoxEntry * entry );
-        ::rtl::OUString getContext( SvLBoxEntry * entry );
+        SvLBoxEntry * getCurrentSingleSelectedEntry() const;
+        bool isFirstLevelChild( SvLBoxEntry * entry ) const;
+        ::rtl::OUString getContext( SvLBoxEntry * entry ) const;
         css::uno::Reference<css::deployment::XPackage> getPackage(
-            SvLBoxEntry * entry );
+            SvLBoxEntry * entry ) const;
         css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> >
-        getSelectedPackages( bool onlyFirstLevel = false );
+        getSelectedPackages( bool onlyFirstLevel = false ) const;
     };
 
     class SyncPushButton : public PushButton
@@ -234,7 +247,7 @@ struct DialogImpl :
 
     // controls:
     ::std::auto_ptr<FixedText> m_ftPackages;
-    ::std::auto_ptr<Control> m_selectionBox;
+    ::std::auto_ptr<SelectionBoxControl> m_selectionBox;
     ::std::auto_ptr<HeaderBar> m_headerBar;
     ::std::auto_ptr<TreeListBoxImpl> m_treelb;