de-src solo variable watch editbox
Change-Id: I9e69df546d5d6453fbd89b38d4865c9fd3088678
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 36b09dd..24444c6 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,7 +23,6 @@
#include <svx/svxids.hrc>
#define RID_BASICIDE_OBJECTBAR ( RID_BASICIDE_START + 0 )
#define RID_EDT_WATCHEDIT ( RID_BASICIDE_START + 4 )
#define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 )
#define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 )
#define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 )
@@ -149,4 +148,4 @@
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index c83bc7b..ea89aac 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1559,16 +1559,19 @@ namespace
const sal_uInt16 ITEM_ID_TYPE = 3;
}
WatchWindow::WatchWindow (Layout* pParent) :
DockingWindow(pParent),
aWatchStr( IDEResId( RID_STR_REMOVEWATCH ) ),
aXEdit( VclPtr<ExtendedEdit>::Create(this, IDEResId( RID_EDT_WATCHEDIT )) ),
aRemoveWatchButton( VclPtr<ImageButton>::Create(this, IDEResId( RID_IMGBTN_REMOVEWATCH )) ),
aTreeListBox( VclPtr<WatchTreeListBox>::Create(this, WB_BORDER | WB_3DLOOK | WB_HASBUTTONS | WB_HASLINES | WB_HSCROLL | WB_TABSTOP
| WB_HASLINESATROOT | WB_HASBUTTONSATROOT) ),
aHeaderBar( VclPtr<HeaderBar>::Create( this, WB_BUTTONSTYLE | WB_BORDER ) )
WatchWindow::WatchWindow (Layout* pParent)
: DockingWindow(pParent)
, aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
, aXEdit(VclPtr<ExtendedEdit>::Create(this, WB_BORDER | WB_3DLOOK))
, aRemoveWatchButton(VclPtr<ImageButton>::Create(this, IDEResId(RID_IMGBTN_REMOVEWATCH)))
, aTreeListBox(VclPtr<WatchTreeListBox>::Create(this, WB_BORDER | WB_3DLOOK | WB_HASBUTTONS |
WB_HASLINES | WB_HSCROLL | WB_TABSTOP |
WB_HASLINESATROOT | WB_HASBUTTONSATROOT))
, aHeaderBar(VclPtr<HeaderBar>::Create(this, WB_BUTTONSTYLE | WB_BORDER))
{
aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
aXEdit->SetHelpId(HID_BASICIDE_WATCHWINDOW_EDIT);
aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), MapUnit::MapAppFont));
aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 08a6f72..a9d08c3 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,13 +285,6 @@ String RID_STR_SEARCHALLMODULES
{
Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
};
Edit RID_EDT_WATCHEDIT
{
HelpId = HID_BASICIDE_WATCHWINDOW_EDIT ;
Border = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 80 , 12 ) ;
};
ImageButton RID_IMGBTN_REMOVEWATCH
{
HelpId = HID_BASICIDE_REMOVEWATCH ;
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 5c88925..580da6a 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -39,7 +39,7 @@ protected:
DECL_LINK( ImplLoseFocusHdl, Control&, void );
public:
ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
ExtendedEdit(vcl::Window* pParent, WinBits nStyle);
void SetAccHdl( const Link<Accelerator&,void>& rLink ) { aAccHdl = rLink; }
Accelerator& GetAccelerator() { return aAcc; }
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 9bff85d..5b0f9de 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -414,12 +414,8 @@ void DockingWindow::DockThis ()
}
}
// ExtendedEdit
ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
Edit( pParent, nRes )
ExtendedEdit::ExtendedEdit(vcl::Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle)
{
aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) );
Control::SetGetFocusHdl( LINK( this, ExtendedEdit, ImplGetFocusHdl ) );
@@ -432,21 +428,16 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, void)
aLoseFocusHdl.Call( this );
}
IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
{
Application::RemoveAccel( &aAcc );
}
IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void )
{
aAccHdl.Call( rAcc );
}
// TabBar
TabBar::TabBar( vcl::Window* pParent ) :
::TabBar( pParent, WinBits( WB_3DLOOK | WB_SCROLL | WB_BORDER | WB_SIZEABLE | WB_DRAG ) )
{
