strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: #89181# TF_SVDATA fixed

Browse source
This commit is contained in:
Peter Burow 2001-07-04 08:38:42 +00:00
parent 57edb072f7
commit 33d10b41b6
3 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
svtools/source/brwbox/datwin.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: datwin.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: oj $ $Date: 2001-07-03 12:24:31 $
* last change: $Author: pb $ $Date: 2001-07-04 09:37:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -621,7 +621,6 @@ BrowseEvent::BrowseEvent( Window* pWindow,
}
//===================================================================
#ifndef TF_SVDATA
BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWin,
const MouseEvent& rEvt ):
MouseEvent(rEvt),
@ -640,7 +639,7 @@ BrowserMouseEvent::BrowserMouseEvent( Window *pWin, const MouseEvent& rEvt,
}
//===================================================================
#ifndef TF_SVDATA
BrowserDropEvent::BrowserDropEvent( BrowserDataWin *pWin, const DropEvent& rEvt )
:DropEvent(rEvt)
,BrowseEvent( pWin->CreateBrowseEvent( rEvt.GetPosPixel() ) )

8
svtools/source/contnr/imivctl.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: imivctl.hxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: pb $ $Date: 2001-05-08 04:27:46 $
* last change: $Author: pb $ $Date: 2001-07-04 09:38:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -516,6 +516,7 @@ public:
BOOL IsEntryEditing() const { return (BOOL)(pCurEditedEntry!=0); }
void EditEntry( SvxIconChoiceCtrlEntry* pEntry );
void StopEntryEditing( BOOL bCancel );
#ifndef TF_SVDATA
BOOL QueryDrop( DropEvent& rDEvt );
void QueryDropImpl(
const DropEvent& rDEvt,
@ -525,6 +526,8 @@ public:
void DropStartImpl( const DropEvent& );
void DropEndImpl();
void InitStartDrag( const CommandEvent& rDEvt );
void MoveDraggedEntries( const DropEvent& rDEvt );
#endif
void LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, BOOL bLock );
ULONG GetEntryCount() const { return aEntries.Count(); }
SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); }
@ -536,7 +539,6 @@ public:
SvxIconChoiceCtrlTextMode GetEntryTextModeSmart( const SvxIconChoiceCtrlEntry* pEntry ) const;
void SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; }
SelectionMode GetSelectionMode() const { return eSelectionMode; }
void MoveDraggedEntries( const DropEvent& rDEvt );
BOOL AreEntriesMoved() const { return (BOOL)((nFlags & F_MOVED_ENTRIES)!=0); }
void SetEntriesMoved( BOOL bMoved )
{

27
svtools/source/contnr/imivctl1.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: imivctl1.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: pb $ $Date: 2001-07-04 08:41:09 $
* last change: $Author: pb $ $Date: 2001-07-04 09:38:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -61,6 +61,9 @@
#include <limits.h>
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
#endif
#ifndef _SV_WALL_HXX
#include <vcl/wall.hxx>
#endif
@ -70,21 +73,20 @@
#ifndef _SV_DECOVIEW_HXX
#include <vcl/decoview.hxx>
#endif
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
#endif
#ifndef _SV_SVAPP_HXX //autogen wg. Application
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
#ifndef _SV_DRAG_HXX //autogen wg. DragManager
#include <vcl/drag.hxx>
#endif
#ifndef _SV_POLY_HXX
#include <vcl/poly.hxx>
#endif
#ifndef _SV_LINEINFO_HXX
#include <vcl/lineinfo.hxx>
#endif
#ifndef TF_SVDATA
#ifndef _SV_DRAG_HXX
#include <vcl/drag.hxx>
#endif
#endif
#pragma hdrstop
#include "ivctrl.hxx"
@ -219,7 +221,9 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pCurView,
aVisRectChangedTimer.SetTimeoutHdl(LINK(this,SvxIconChoiceCtrl_Impl,VisRectChangedHdl));
Clear( TRUE );
#ifndef TF_SVDATA
pView->EnableDrop( TRUE );
#endif
SetGrid( Size(100, 70) );
}
@ -2781,6 +2785,7 @@ void SvxIconChoiceCtrl_Impl::Command( const CommandEvent& rCEvt )
#endif
}
#ifndef TF_SVDATA
if( rCEvt.GetCommand() == COMMAND_STARTDRAG )
{
if( !GetSelectionCount() || pView->IsTracking() )
@ -2790,8 +2795,10 @@ void SvxIconChoiceCtrl_Impl::Command( const CommandEvent& rCEvt )
DropAction eAction = DragManager::ExecuteDrag( &xObj, DRAG_ALL );
DropEndImpl();
}
#endif
}
#ifndef TF_SVDATA
BOOL SvxIconChoiceCtrl_Impl::QueryDrop( DropEvent& rDEvt )
{
SvxIconChoiceCtrlEntry* pTarget = 0;
@ -3017,7 +3024,7 @@ void SvxIconChoiceCtrl_Impl::MoveDraggedEntries( const DropEvent& rDEvt )
}
CheckScrollBars();
}
#endif
void SvxIconChoiceCtrl_Impl::ToTop( SvxIconChoiceCtrlEntry* pEntry )
{