Drop OS2

9 files changed, 9 insertions, 65 deletions

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 0ba501e976b1..ad4c2518d3f2 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -114,7 +114,6 @@ namespace vcl
     };
 
 /** Value of the width member of the TTGlobalFontInfo struct */
-#ifndef OS2
     enum WidthClass {
         FWIDTH_ULTRA_CONDENSED = 1,         /**< 50% of normal                      */
         FWIDTH_EXTRA_CONDENSED = 2,         /**< 62.5% of normal                    */
@@ -126,7 +125,6 @@ namespace vcl
         FWIDTH_EXTRA_EXPANDED = 8,          /**< 150% of normal                     */
         FWIDTH_ULTRA_EXPANDED = 9           /**< 200% of normal                     */
     };
-#endif // OS2
 #endif /* FW_THIN */
 
 /** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */
@@ -290,7 +288,7 @@ namespace vcl
  * @ingroup sft
  */
     int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
-#if !defined(WIN32) && !defined(OS2)
+#if !defined(WIN32)
 /**
  * TrueTypeFont constructor.
  * Reads the font file and allocates the memory for the structure.
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index a1473d8cbbf0..e25bb482f53c 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -231,7 +231,7 @@ class   SalBitmap;
 
 struct BitmapSystemData
 {
-    #if defined( WNT ) || defined( OS2 )
+    #if defined( WNT )
     void* pDIB; // device independent byte buffer
     void* pDDB; // if not NULL then this is actually an HBITMAP
     #elif defined( QUARTZ )
diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 199f0ad67cac..cab614841e1d 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.hxx
@@ -41,7 +41,7 @@ typedef struct CGLayer   *CGLayerRef;
 class NSView;
 #endif
 #endif
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
 #include <windef.h>
 #endif
 
@@ -52,7 +52,7 @@ class NSView;
 struct SystemEnvData
 {
     unsigned long       nSize;          // size in bytes of this structure
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
     HWND                hWnd;           // the window hwnd
 #elif defined( QUARTZ )
     NSView*               pView;          // the cocoa (NSView *) implementing this object
@@ -80,7 +80,7 @@ struct SystemEnvData
 struct SystemParentData
 {
     unsigned long   nSize;            // size in bytes of this structure
-#if defined( WNT ) || defined( OS2 )
+#if defined( WNT )
     HWND            hWnd;             // the window hwnd
 #elif defined( QUARTZ )
     NSView*         pView;            // the cocoa (NSView *) implementing this object
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 00fbaaeef3c4..fa484b70f6d0 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -77,7 +77,7 @@ static VCLRegServiceInfo aVCLComponentsArray[] =
     {"dtransX11", sal_True},
 #endif
 #endif
-#if defined(WNT) || defined(OS2)
+#if defined(WNT)
     {"sysdtrans", sal_False},
 #endif
     {"dtrans", sal_False},
@@ -177,7 +177,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
 
     OUString aLibName;
 
-#if defined( WNT) || defined(OS2)
+#if defined( WNT)
     aLibName = OUString::createFromAscii( pModName );
     if ( bSUPD )
     {
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 4e3f8ceb0cf2..44ac9414534f 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1515,7 +1515,7 @@ static void allocTrueTypeFont( TrueTypeFont** ttf )
 /* forward declariotn for the two entry points to use*/
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t );
 
-#if !defined(WIN32) && !defined(OS2)
+#if !defined(WIN32)
 int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf )
 {
     int ret, fd = -1;
@@ -1777,7 +1777,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 
 void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/
 {
-#if !defined(WIN32) && !defined(OS2)
+#if !defined(WIN32)
     if( ttf->fname )
         munmap((char *) ttf->ptr, ttf->fsize);
 #endif
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8f579d59790b..59242e24a473 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -82,8 +82,6 @@
 
 #if defined UNX
 #define GLYPH_FONT_HEIGHT   128
-#elif defined OS2
-#define GLYPH_FONT_HEIGHT   176
 #else
 #define GLYPH_FONT_HEIGHT   256
 #endif
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 6265cc55b46d..4f7b09b0f589 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -102,35 +102,6 @@ DBG_NAME( Menu )
 // document closer
 #define IID_DOCUMENTCLOSE 1
 
-#ifdef OS2
-
-#include <xwphook.h>
-
-// return sal_True if hilite should be executed: left mouse button down
-// or xwp mouse hook enabled
-static sal_Bool ImplHilite( const MouseEvent& rMEvt )
-{
-    static sal_Bool init = sal_False;
-    static HOOKCONFIG hc;
-
-    // read XWP settings at program startup
-    if (init == sal_False) {
-        sal_Bool    rc;
-        sal_uLong   cb = sizeof(HOOKCONFIG);
-        memset(&hc, 0, sizeof(HOOKCONFIG));
-        rc = PrfQueryProfileData( HINI_USER, INIAPP_XWPHOOK, INIKEY_HOOK_CONFIG,
-            &hc, &cb);
-        init = sal_True;
-    }
-    // check mouse left button
-    if (rMEvt.GetButtons() == MOUSE_LEFT)
-        return sal_True;
-    // return xwp flag
-    return hc.fSlidingMenus;
-}
-
-#endif
-
 static sal_Bool ImplAccelDisabled()
 {
     // display of accelerator strings may be suppressed via configuration
@@ -4565,10 +4536,6 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt )
 
     if ( rMEvt.IsLeaveWindow() )
     {
-#ifdef OS2
-        if ( ImplHilite(rMEvt) )
-        {
-#endif
         // #102461# do not remove highlight if a popup menu is open at this position
         MenuItemData* pData = pMenu ? pMenu->pItemList->GetDataFromPos( nHighlightedItem ) : NULL;
         // close popup with some delayed if we leave somewhere else
@@ -4577,17 +4544,11 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt )
 
         if( !pActivePopup || (pData && pData->pSubMenu != pActivePopup ) )
             ChangeHighlightItem( ITEMPOS_INVALID, sal_False );
-#ifdef OS2
-        }
-#endif
 
         if ( IsScrollMenu() )
             ImplScroll( rMEvt.GetPosPixel() );
     }
     else
-#ifdef OS2
-        if ( ImplHilite(rMEvt) )
-#endif
     {
         aSubmenuCloseTimer.Stop();
         if( bIgnoreFirstMove )
@@ -5550,9 +5511,6 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt )
 
     sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() );
     if ( ( nEntry != ITEMPOS_INVALID )
-#ifdef OS2
-       && ( ImplHilite(rMEvt) )
-#endif
        && ( nEntry != nHighlightedItem ) )
         ChangeHighlightItem( nEntry, sal_False );
 }
diff --git a/vcl/test/makefile.mk b/vcl/test/makefile.mk
index 64ef8309dfe3..8815053829cc 100644
--- a/vcl/test/makefile.mk
+++ b/vcl/test/makefile.mk
@@ -32,10 +32,6 @@ TARGET=dndtest
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
-.IF "$(GUI)" == "OS2"
-TARGETTYPE=GUI
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index 713d28a43846..bba023ab779f 100755
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -255,12 +255,6 @@ LINKFLAGSSHL += /ENTRY:LibMain@12
 .ENDIF
 .ENDIF
 
-# --- OS2 ----------------------------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-STDSHL1 += ft2lib.lib
-.ENDIF
-
 # --- UNX ----------------------------------------------------------------
 
 # UNX sal plugins