summaryrefslogtreecommitdiff
path: root/vcl/ios
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-10-07 21:26:06 +0300
committerTor Lillqvist <tml@collabora.com>2015-10-07 21:34:07 +0300
commit99b935ff7dd069f2a0aad5054d07bc6f71411d84 (patch)
tree4eda30de44078f9e68c2e4f153bf8af687d8e8a6 /vcl/ios
parent3c9da1fbfae9c00a5eb9ddcb106a01b075703fcd (diff)
Make this compile for iOS again
Change-Id: Idd4a1e6d50652a879493d8411c59605ca1a53dfb
Diffstat (limited to 'vcl/ios')
-rw-r--r--vcl/ios/iosinst.cxx38
1 files changed, 1 insertions, 37 deletions
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 2b58ed7ab234..c94330c86f5a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -47,28 +47,6 @@ void IosSalInstance::GetWorkArea( Rectangle& rRect )
Size( viewWidth, viewHeight ) );
}
-/*
- * Try too hard to get a frame, in the absence of anything better to do
- */
-SalFrame *IosSalInstance::getFocusFrame() const
-{
- SalFrame *pFocus = SvpSalFrame::GetFocusFrame();
- if (!pFocus) {
- const std::list< SalFrame* >& rFrames( getFrames() );
- for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it )
- {
- SvpSalFrame *pFrame = const_cast<SvpSalFrame*>(static_cast<const SvpSalFrame*>(*it));
- if( pFrame->IsVisible() )
- {
- pFrame->GetFocus();
- pFocus = pFrame;
- break;
- }
- }
- }
- return pFocus;
-}
-
IosSalInstance *IosSalInstance::getInstance()
{
if (!ImplGetSVData())
@@ -88,20 +66,6 @@ IosSalInstance::~IosSalInstance()
{
}
-#if 0
-
-bool IosSalInstance::AnyInput( VclInputFlags nType )
-{
- if( nType & VclInputFlags::TIMER )
- return CheckTimeout( false );
-
- // Unfortunately there is no way to check for a specific type of
- // input being queued. That information is too hidden, sigh.
- return SvpSalInstance::s_pDefaultInstance->PostedEventsInQueue();
-}
-
-#endif
-
class IosSalSystem : public SvpSalSystem {
public:
IosSalSystem() : SvpSalSystem() {}
@@ -122,7 +86,7 @@ class IosSalFrame : public SvpSalFrame
public:
IosSalFrame( IosSalInstance *pInstance,
SalFrame *pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,