4 files changed, 18 insertions, 4 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 571c32e30..3211e5565 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1183,6 +1183,9 @@ WatchWindow::WatchWindow( Window* pParent ) :
                                   | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ),
     aHeaderBar( this, WB_BUTTONSTYLE | WB_BORDER )
 {
+    aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
+    aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));		
+    
     nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
     nHeaderBarHeight = 16;
 
@@ -1521,11 +1524,12 @@ StackWindow::StackWindow( Window* pParent ) :
     aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ),
     aStackStr( IDEResId( RID_STR_STACK ) )
 {
-    aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
+       aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
+    aTreeListBox.SetAccessibleName(String( IDEResId(RID_STR_STACKNAME)));		
     aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) );
     aTreeListBox.SetHighlightRange();
-    aTreeListBox.SetSelectionMode( NO_SELECTION );
-    aTreeListBox.InsertEntry( String(), 0, FALSE, LIST_APPEND );
+       aTreeListBox.SetSelectionMode( NO_SELECTION );
+       aTreeListBox.InsertEntry( String(), 0, FALSE, LIST_APPEND );
     aTreeListBox.Show();
 
     SetText( String( IDEResId( RID_STR_STACKNAME ) ) );
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 9c1d74879..137e36069 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -108,8 +108,10 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
                              WB_HSCROLL );
 
     aMacroTreeList.SetSelectHdl( LINK( this, ObjectCatalog, TreeListHighlightHdl ) );
-
+    aMacroTreeList.SetAccessibleName(String(IDEResId(RID_STR_TLB_MACROS)));
     aMacroTreeList.ScanAllEntries();
+    aMacroTreeList.GrabFocus();
+
     CheckButtons();
 
     Point aPos = IDE_DLL()->GetExtraData()->GetObjectCatalogPos();
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index ea3ca2225..032bf50fb 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -37,4 +37,6 @@
 
 #define TBITEM_SHOW		1
 
+#define RID_STR_TLB_MACROS 		( RID_BASICIDE_START + 71 )
+
 #endif // _OBJDLG_HXX
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index 6f379ed4c..bb77390c0 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -92,3 +92,9 @@ FloatingWindow RID_BASICIDE_OBJCAT
         Size = MAP_APPFONT ( 185 , 18 ) ;
     };
 };
+
+String RID_STR_TLB_MACROS
+{
+    Text [ en-US ] = "Objects Tree";
+}; 
+