From 27266b10b8aaa9e2f559de7e6c36249c329105f4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sat, 21 May 2011 17:00:45 +0300
Subject: Drop OS2

---
 toolkit/source/awt/vclxsystemdependentwindow.cxx | 5 -----
 toolkit/source/awt/vclxtoolkit.cxx               | 9 ---------
 toolkit/source/awt/vclxtopwindow.cxx             | 5 -----
 toolkit/source/awt/vclxwindow1.cxx               | 2 +-
 4 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'toolkit/source')

diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 7f2721726e9e..7cb667b18528 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -92,11 +92,6 @@ IMPL_XTYPEPROVIDER_END
             {
                  aRet <<= (sal_Int32)pSysData->hWnd;
             }
-#elif (defined OS2)
-            if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 )
-            {
-                 aRet <<= (sal_Int32)pSysData->hWnd;
-            }
 #elif (defined QUARTZ)
             if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
             {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index a8cf619f21bf..c879e4b6bd2c 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -131,8 +131,6 @@ namespace css = ::com::sun::star;
 
 #if (defined WNT)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32
-#elif (defined OS2)
-#define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_OS2
 #elif (defined QUARTZ)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_MAC
 #elif (defined UNX)
@@ -345,9 +343,6 @@ extern "C"
 static int
 #if defined( WNT )
  __cdecl
-#endif
-#if defined( ICC ) && defined( OS2 )
-_Optlink
 #endif
      ComponentInfoCompare( const void* pFirst, const void* pSecond)
 {
@@ -989,8 +984,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                                     aParentData.bXEmbedSupport = bXEmbed;
                                     #elif defined WNT
                                     aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle);
-                                    #elif defined OS2
-                                    aParentData.hWnd = (HWND)nWindowHandle;
                                     #endif
                                     pNewWindow = new WorkWindow( &aParentData );
                                 }
@@ -1215,8 +1208,6 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
             aParentData.bXEmbedSupport = bXEmbed;
             #elif defined WNT
             aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle);
-            #elif defined OS2
-            aParentData.hWnd = (HWND)nWindowHandle;
             #endif
             SolarMutexGuard aGuard;
             try
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index abcf616a2a90..8bf3c861c01d 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -104,11 +104,6 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
             {
                  aRet <<= (sal_Int32)pSysData->hWnd;
             }
-#elif (defined OS2)
-            if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_OS2 )
-            {
-                 aRet <<= (sal_Int32)pSysData->hWnd;
-            }
 #elif (defined QUARTZ)
             if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
             {
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 3039e11c3895..6a9c64ba3c95 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -92,7 +92,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle )
     // create system parent data
     SystemParentData aSysParentData;
     aSysParentData.nSize = sizeof ( SystemParentData );
-#if defined( WNT ) || defined ( OS2 )
+#if defined( WNT )
     aSysParentData.hWnd = (HWND) nHandle;
 #elif defined( QUARTZ )
     aSysParentData.pView = reinterpret_cast<NSView*>(nHandle);
-- 
cgit