summaryrefslogtreecommitdiff
path: root/toolkit/source/awt
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/source/awt')
-rw-r--r--toolkit/source/awt/vclxgraphics.cxx16
-rw-r--r--toolkit/source/awt/vclxsystemdependentwindow.cxx11
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx13
-rw-r--r--toolkit/source/awt/vclxtopwindow.cxx11
-rw-r--r--toolkit/source/awt/vclxwindow1.cxx6
-rw-r--r--toolkit/source/awt/vclxwindows.cxx2
6 files changed, 53 insertions, 6 deletions
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index dc2c84702664..8f29a5e5e86f 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@@ -73,9 +73,17 @@ VCLXGraphics::VCLXGraphics()
VCLXGraphics::~VCLXGraphics()
{
- List* pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL;
+ VCLXGraphicsList_impl* pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL;
if ( pLst )
- pLst->Remove( this );
+ {
+ for( VCLXGraphicsList_impl::iterator it = pLst->begin(); it < pLst->end(); ++it )
+ {
+ if( *it == this ) {
+ pLst->erase( it );
+ break;
+ }
+ }
+ }
delete mpClipRegion;
}
@@ -100,10 +108,10 @@ void VCLXGraphics::Init( OutputDevice* pOutDev )
mpClipRegion = NULL;
// Register at OutputDevice
- List* pLst = mpOutputDevice->GetUnoGraphicsList();
+ VCLXGraphicsList_impl* pLst = mpOutputDevice->GetUnoGraphicsList();
if ( !pLst )
pLst = mpOutputDevice->CreateUnoGraphicsList();
- pLst->Insert( this, LIST_APPEND );
+ pLst->push_back( this );
}
void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags )
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 7cb667b18528..646462521af6 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -46,6 +46,12 @@
#include "postmac.h"
#endif
+#ifdef IOS
+#include "premac.h"
+#include <UIKit/UIKit.h>
+#include "postmac.h"
+#endif
+
#include <vcl/svapp.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
@@ -97,6 +103,11 @@ IMPL_XTYPEPROVIDER_END
{
aRet <<= (sal_IntPtr)pSysData->pView;
}
+#elif (defined IOS)
+ if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_IOS )
+ {
+ aRet <<= (sal_IntPtr)pSysData->pView;
+ }
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index f255777f5cb6..19a76c9052c8 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -64,6 +64,13 @@
#include <Cocoa/Cocoa.h>
#include "postmac.h"
#endif
+
+#ifdef IOS
+#include "premac.h"
+#include <UIKit/UIKit.h>
+#include "postmac.h"
+#endif
+
#include <vcl/sysdata.hxx>
#include <toolkit/awt/vclxwindows.hxx>
@@ -982,6 +989,8 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
aParentData.nSize = sizeof( aParentData );
#if defined QUARTZ
aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle);
+ #elif defined IOS
+ aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle);
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
@@ -1069,7 +1078,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
{
VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( rDescriptor.Parent );
- // #103939# Don't through assertion, may be it's a system dependend window, used in ImplCreateWindow.
+ // #103939# Don't throw assertion, may be it's a system dependend window, used in ImplCreateWindow.
// DBG_ASSERT( pParentComponent, "ParentComponent not valid" );
if ( pParentComponent )
@@ -1206,6 +1215,8 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
aParentData.nSize = sizeof( aParentData );
#if defined QUARTZ
aParentData.pView = reinterpret_cast<NSView*>(nWindowHandle);
+ #elif defined IOS
+ aParentData.pView = reinterpret_cast<UIView*>(nWindowHandle);
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 8bf3c861c01d..44f8f94cb50c 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -37,6 +37,12 @@
#include "postmac.h"
#endif
+#if defined ( IOS )
+#include "premac.h"
+#include <UIKit/UIKit.h>
+#include "postmac.h"
+#endif
+
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -109,6 +115,11 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
{
aRet <<= (sal_IntPtr)pSysData->pView;
}
+#elif (defined IOS)
+ if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_IOS )
+ {
+ aRet <<= (sal_IntPtr)pSysData->pView;
+ }
#elif (defined UNX)
if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )
{
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 6a9c64ba3c95..28d97fcb826d 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -43,6 +43,10 @@
#include "premac.h"
#include <Cocoa/Cocoa.h>
#include "postmac.h"
+#elif defined ( IOS )
+#include "premac.h"
+#include <UIKit/UIKit.h>
+#include "postmac.h"
#endif
#include <vcl/sysdata.hxx>
@@ -96,6 +100,8 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
aSysParentData.hWnd = (HWND) nHandle;
#elif defined( QUARTZ )
aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
+#elif defined( IOS )
+ aSysParentData.pView = reinterpret_cast<UIView*>(nHandle);
#elif defined( UNX )
aSysParentData.aWindow = (long)nHandle;
aSysParentData.bXEmbedSupport = bXEmbed;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 1c6d5418dd38..f95ceb65f3ac 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6470,7 +6470,7 @@ void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& Lit
PatternField* pPatternField = (PatternField*) GetWindow();
if ( pPatternField )
{
- EditMask = String( pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US );
+ EditMask = rtl::OStringToOUString(pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US);
LiteralMask = pPatternField->GetLiteralMask();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 07:21:57 +0000