Commits

Anonymous committed 62cbfaa

vcl117: #i115686# remove old unused style setting

  • Participants
  • Parent commits 9e6d396

Comments (0)

Files changed (30)

File dbaccess/source/ui/dlg/UserAdminDlg.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 	String STR_PAGETITLE_USERADMIN
 	{

File dbaccess/source/ui/dlg/advancedsettings.src

     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     
     String STR_GENERATED_VALUE

File dbaccess/source/ui/dlg/dbadmin.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 
 	//.........................................................................
 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 	Text [ en-US ] = "Database properties" ;
 };

File dbaccess/source/ui/dlg/dbadminsetup.src

 	{
 		OutputSize = TRUE ;
 		HelpId = HID_DSADMIN_TABCONTROL;
-		SingleLine=TRUE;
 	};
 
 	String STR_DBWIZARDTITLE

File desktop/source/app/app.cxx

     }
     hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus);
 
-    sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
-    nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
-    if( aAppearanceCfg.IsSingleLineTabCtrl() )
-        nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
-
-    nTabStyle &= ~STYLE_TABCONTROL_COLOR;
-    if( aAppearanceCfg.IsColoredTabCtrl() )
-        nTabStyle |= STYLE_TABCONTROL_COLOR;
-
-    hStyleSettings.SetTabControlStyle(nTabStyle);
-
 	hStyleSettings.SetDragFullOptions( nDragFullOptions );
 	rSettings.SetStyleSettings ( hStyleSettings );
 }

File officecfg/registry/schema/org/openoffice/Office/Common.xcs

 				</constraints>
 				<value>100</value>
 			</prop>
-			<prop oor:name="LookAndFeel" oor:type="xs:short">
-				<!-- OldPath: General/View -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Tools  Options - General  View  [Section] Display -->
-				<info>
-					<author>PB</author>
-					<desc>Determines the look and feel of the application.</desc>
-					<label>Look &amp; Feel</label>
-				</info>
-				<constraints>
-					<enumeration oor:value="0">
-						<info>
-							<desc>Standard</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="1">
-						<info>
-							<desc>Macintosh</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="2">
-						<info>
-							<desc>X Window</desc>
-						</info>
-					</enumeration>
-					<enumeration oor:value="3">
-						<info>
-							<desc>OS/2</desc>
-						</info>
-					</enumeration>
-				</constraints>
-				<value>0</value>
-			</prop>
 			<group oor:name="NewDocumentHandling">
 				<info>
 					<author>CD</author>
 					</info>
 					<value>true</value>
 				</prop>
-				<prop oor:name="ColoredTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with colored tab control (True)</desc>
-						<label>Colored tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 				<prop oor:name="MousePositioning" oor:type="xs:short">
 					<!-- OldPath: General/View -->
 					<!-- OldLocation: soffice.cfg -->
 					</constraints>
 					<value>1</value>
 				</prop>
-				<prop oor:name="SingleLineTab" oor:type="xs:boolean">
-					<!-- OldPath: General/View -->
-					<!-- OldLocation: soffice.cfg -->
-					<!-- UIHints: Tools  Options - General  View  [Section] Options -->
-					<info>
-						<author>PB</author>
-						<desc>Specifies TabDialogs with single line tab control (True).</desc>
-						<label>Single line tab controls</label>
-					</info>
-					<value>false</value>
-				</prop>
 			</group>
 			<group oor:name="Localisation">
 				<info>

File rsc/inc/rscdb.hxx

 	Atom				nTopImageId;
 	Atom				nNoLabelId;
 	Atom				nVertId;
-    Atom				nSingleLineId;
     Atom				nSysWinId;
 
 	void		Init(); 		// Initialisiert Klassen und Tabelle

File rsc/inc/vclrsc.hxx

 #define SYMBOL_DOCK 			((SymbolType)32)
 #define SYMBOL_HIDE 			((SymbolType)33)
 #define SYMBOL_HELP 			((SymbolType)34)
-#define SYMBOL_OS2CLOSE 		((SymbolType)35)
-#define SYMBOL_OS2FLOAT 		((SymbolType)36)
-#define SYMBOL_OS2HIDE			((SymbolType)37)
 
 #define SYMBOL_NOSYMBOL 		(SYMBOL_DONTKNOW)
 

File rsc/source/parser/rscicpx.cxx

 		pClassTabControl->SetVariable( nId, pCont, NULL, 0,
 									   RSC_TABCONTROL_ITEMLIST );
 
-        INS_WINBIT( pClassTabControl, SingleLine );
         INS_WINBIT( pClassTabControl, DropDown );
 	}
 

File rsc/source/parser/rscinit.cxx

 	aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) );
 	nVertId				= pHS->getID( "WB_VERT" );
 	aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) );
-    nSingleLineId		= pHS->getID( "WB_SINGLELINE" );
-    aWinBits.SetConstant( nSingleLineId, sal::static_int_cast<INT32>(WB_SINGLELINE) );
     nSysWinId           = pHS->getID( "WB_SYSTEMWINDOW" );
     aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) );
 }

File svtools/inc/apearcfg.hxx

 	 Beschreibung:
  --------------------------------------------------------------------*/
 typedef enum {
-	LookStardivision = 0,
-	LookMotif,
-	LookWindows,
-	LookOSTwo,
-	LookMacintosh
-} SystemLook;
-
-typedef enum {
     SnapToButton = 0,
     SnapToMiddle,
     NoSnap
 
 class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
 {
-    short           nLookNFeel			;
     short           nDragMode			;
     short           nScaleFactor		;
     short           nSnapMode			;
 #endif
 
     BOOL            bMenuMouseFollow        ;
-    BOOL            bSingleLineTabCtrl      ;
-    BOOL            bColoredTabCtrl         ;
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
 	BOOL			bFontAntialiasing		;
 #endif
     virtual void    Commit();
 	virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
-	USHORT		GetLookNFeel () const { return nLookNFeel; }
-	void		SetLookNFeel ( USHORT nSet );
-
 	USHORT		GetDragMode  () const { return nDragMode; }
 	void		SetDragMode  ( USHORT nSet );
 
     void        SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();}
 	BOOL		IsMenuMouseFollow() const{return bMenuMouseFollow;}
 
-    void        SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();}
-	BOOL        IsSingleLineTabCtrl()const {return   bSingleLineTabCtrl;}
-
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
 	void		SetFontAntiAliasing( BOOL bSet )	{ bFontAntialiasing = bSet; SetModified(); }
 	BOOL		IsFontAntiAliasing() const { return bFontAntialiasing; }
 	void		SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
 #endif
 
-    void        SetColoredTabCtrl(BOOL bSet)   {bColoredTabCtrl = bSet; SetModified();};
-	BOOL        IsColoredTabCtrl()const {return     bColoredTabCtrl;}
-
 	static sal_Bool IsInitialized()  { return bInitialized; }
 	static void	   SetInitialized() { bInitialized = sal_True; }
 };

File svtools/source/config/apearcfg.cxx

  --------------------------------------------------------------------*/
 SvtTabAppearanceCfg::SvtTabAppearanceCfg()
 	:ConfigItem(OUString::createFromAscii("Office.Common/View"))
-	,nLookNFeel			( DEFAULT_LOOKNFEEL )
 	,nDragMode			( DEFAULT_DRAGMODE )
 	,nScaleFactor       ( DEFAULT_SCALEFACTOR )
 	,nSnapMode			( DEFAULT_SNAPMODE )
 	,nAAMinPixelHeight	( DEFAULT_AAMINHEIGHT )
 #endif
 	,bMenuMouseFollow(FALSE)
-	,bSingleLineTabCtrl(FALSE)
-    ,bColoredTabCtrl(FALSE)
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
 	,bFontAntialiasing	( TRUE )
 #endif
 				switch(nProp)
 				{
                     case  0: *pValues >>= nScaleFactor; break; //"FontScaling",
-                    case  1: *pValues >>= nLookNFeel; break;  //"LookAndFeel",
-                    case  2: *pValues >>= nDragMode; break;   //"Window/Drag",
-                    case  3: bMenuMouseFollow = *(sal_Bool*)pValues->getValue(); break; //"Menu/FollowMouse",
-                    case  4: bSingleLineTabCtrl      = *(sal_Bool*)pValues->getValue(); break; //"Dialog/SingleLineTab",
-                    case  5: bColoredTabCtrl = *(sal_Bool*)pValues->getValue(); break; //"Dialog/ColoredTab",
-                    case  6: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
-                    case  7: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
+                    case  1: *pValues >>= nDragMode; break;   //"Window/Drag",
+                    case  2: bMenuMouseFollow = *(sal_Bool*)pValues->getValue(); break; //"Menu/FollowMouse",
+                    case  3: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
+                    case  4: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-                    case  8: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break;    // "FontAntialising/Enabled",
-                    case  9: *pValues >>= nAAMinPixelHeight; break;                         // "FontAntialising/MinPixelHeight",
+                    case  5: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break;    // "FontAntialising/Enabled",
+                    case  6: *pValues >>= nAAMinPixelHeight; break;                         // "FontAntialising/MinPixelHeight",
 #endif
                 }
 			}
         static const sal_Char* aPropNames[] =
         {
              "FontScaling"                       //  0
-            ,"LookAndFeel"                       //  1
-            ,"Window/Drag"                       //  2
-            ,"Menu/FollowMouse"                  //  3
-            ,"Dialog/SingleLineTab"              //  4
-            ,"Dialog/ColoredTab"                 //  5
-            ,"Dialog/MousePositioning"           //  6
-            ,"Dialog/MiddleMouseButton"          //  7
+            ,"Window/Drag"                       //  1
+            ,"Menu/FollowMouse"                  //  2
+            ,"Dialog/MousePositioning"           //  3
+            ,"Dialog/MiddleMouseButton"          //  4
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-            ,"FontAntiAliasing/Enabled"         //  8
-            ,"FontAntiAliasing/MinPixelHeight"  //  9
+            ,"FontAntiAliasing/Enabled"         //  5
+            ,"FontAntiAliasing/MinPixelHeight"  //  6
 #endif
         };
         const int nCount = sizeof( aPropNames ) / sizeof( aPropNames[0] );
 		switch(nProp)
 		{
             case  0: pValues[nProp] <<= nScaleFactor; break;            // "FontScaling",
-            case  1: pValues[nProp] <<= nLookNFeel; break;              //"LookAndFeel",
-            case  2: pValues[nProp] <<= nDragMode; break;               //"Window/Drag",
-            case  3: pValues[nProp].setValue(&bMenuMouseFollow, rType); break; //"Menu/FollowMouse",
-            case  4: pValues[nProp].setValue(&bSingleLineTabCtrl, rType); break; //"Dialog/SingleLineTab",
-            case  5: pValues[nProp].setValue(&bColoredTabCtrl, rType); break; //"Dialog/ColoredTab",
-            case  6: pValues[nProp] <<= nSnapMode; break;               //"Dialog/MousePositioning",
-            case  7: pValues[nProp] <<= nMiddleMouse; break;               //"Dialog/MiddleMouseButton",
+            case  1: pValues[nProp] <<= nDragMode; break;               //"Window/Drag",
+            case  2: pValues[nProp].setValue(&bMenuMouseFollow, rType); break; //"Menu/FollowMouse",
+            case  3: pValues[nProp] <<= nSnapMode; break;               //"Dialog/MousePositioning",
+            case  4: pValues[nProp] <<= nMiddleMouse; break;               //"Dialog/MiddleMouseButton",
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-            case  8: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
-            case  9: pValues[nProp] <<= nAAMinPixelHeight; break;               // "FontAntialising/MinPixelHeight",
+            case  5: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
+            case  6: pValues[nProp] <<= nAAMinPixelHeight; break;               // "FontAntialising/MinPixelHeight",
 #endif
         }
 	}
 	 Beschreibung:
  --------------------------------------------------------------------*/
 
-void SvtTabAppearanceCfg::SetLookNFeel ( USHORT nSet )
-{
-	nLookNFeel = nSet;
-    SetModified();
-}
-
-/*--------------------------------------------------------------------
-	 Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetDragMode  ( USHORT nSet )
 {
 	nDragMode = nSet;
 	// SetStandard...Styles() resets the UseSystemUIFonts flag,
 	// but we don't want to change it now, so save the flag before ...
 	BOOL bUseSystemUIFonts = hAppStyle.GetUseSystemUIFonts();
-
-	switch ( nLookNFeel )
-	{
-		case LookMotif:
-			hAppStyle.SetStandardUnixStyles();	break;
-
-		case LookOSTwo:
-			hAppStyle.SetStandardOS2Styles();	break;
-
-		case LookMacintosh:
-			hAppStyle.SetStandardMacStyles();	break;
-
-		case LookWindows:
-			hAppStyle.SetStandardWinStyles();	break;
-
-		case LookStardivision:
-		default:
-			hAppStyle.SetStandardStyles();		break;
-	}
-
+	hAppStyle.SetStandardStyles();
 	// and set it here
 	hAppStyle.SetUseSystemUIFonts( bUseSystemUIFonts );
 
     else
         nFollow &= ~MOUSE_FOLLOW_MENU;
     hMouseSettings.SetFollow( nFollow );
-    sal_uInt16 nTabStyle = 0;
-    if(bSingleLineTabCtrl)
-        nTabStyle |= STYLE_TABCONTROL_SINGLELINE;
-
-    if(bColoredTabCtrl)
-        nTabStyle |= STYLE_TABCONTROL_COLOR;
-    hAppStyle.SetTabControlStyle(nTabStyle);
-
 
     hAppSettings.SetMouseSettings( hMouseSettings );
 

File svx/source/fmcomp/gridcell.cxx

 
 namespace
 {
-    void setCheckBoxStyle( Window* _pWindow, USHORT nStyle )
+    void setCheckBoxStyle( Window* _pWindow, bool bMono )
     {
         AllSettings aSettings = _pWindow->GetSettings();
 	    StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-        aStyleSettings.SetCheckBoxStyle( nStyle );
+	    if( bMono )
+	        aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
+	    else
+	        aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) );
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );
     }
         sal_Int16 nStyle = awt::VisualEffect::LOOK3D;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle );
 
-        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
-        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
+        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT );
+        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT );
 
         sal_Bool bTristate = sal_True;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate );

File toolkit/source/awt/vclxwindows.cxx

         _pWindow->SetStyle( nStyle );
     }
 
-    static void setVisualEffect( const Any& _rValue, Window* _pWindow, void (StyleSettings::*pSetter)( USHORT ), sal_Int16 _nFlatBits, sal_Int16 _n3DBits )
+    static void setVisualEffect( const Any& _rValue, Window* _pWindow )
     {
         AllSettings aSettings = _pWindow->GetSettings();
 	    StyleSettings aStyleSettings = aSettings.GetStyleSettings();
         switch ( nStyle )
         {
         case FLAT:
-            (aStyleSettings.*pSetter)( _nFlatBits );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & ~STYLE_OPTION_MONO );
             break;
         case LOOK3D:
         default:
-            (aStyleSettings.*pSetter)( _n3DBits );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
         }
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );
     }
 
-    static Any getVisualEffect( Window* _pWindow, USHORT (StyleSettings::*pGetter)( ) const, sal_Int16 _nFlatBits )
+    static Any getVisualEffect( Window* _pWindow )
     {
         Any aEffect;
 
         StyleSettings aStyleSettings = _pWindow->GetSettings().GetStyleSettings();
-        if ( (aStyleSettings.*pGetter)() == _nFlatBits )
+        if ( (aStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
             aEffect <<= (sal_Int16)FLAT;
         else
             aEffect <<= (sal_Int16)LOOK3D;
 		switch ( nPropType )
 		{
             case BASEPROPERTY_VISUALEFFECT:
-                ::toolkit::setVisualEffect( Value, pCheckBox, &StyleSettings::SetCheckBoxStyle, STYLE_CHECKBOX_MONO, STYLE_CHECKBOX_WIN );
+                ::toolkit::setVisualEffect( Value, pCheckBox );
                 break;
 
 			case BASEPROPERTY_TRISTATE:
 		switch ( nPropType )
 		{
             case BASEPROPERTY_VISUALEFFECT:
-                aProp = ::toolkit::getVisualEffect( pCheckBox, &StyleSettings::GetCheckBoxStyle, STYLE_CHECKBOX_MONO );
+                aProp = ::toolkit::getVisualEffect( pCheckBox );
                 break;
 			case BASEPROPERTY_TRISTATE:
  				aProp <<= (sal_Bool)pCheckBox->IsTriStateEnabled();
 		switch ( nPropType )
 		{
             case BASEPROPERTY_VISUALEFFECT:
-                ::toolkit::setVisualEffect( Value, pButton, &StyleSettings::SetRadioButtonStyle, STYLE_RADIOBUTTON_MONO, STYLE_RADIOBUTTON_WIN );
+                ::toolkit::setVisualEffect( Value, pButton );
                 break;
 
 			case BASEPROPERTY_STATE:
 		switch ( nPropType )
 		{
             case BASEPROPERTY_VISUALEFFECT:
-                aProp = ::toolkit::getVisualEffect( pButton, &StyleSettings::GetRadioButtonStyle, STYLE_RADIOBUTTON_MONO );
+                aProp = ::toolkit::getVisualEffect( pButton );
                 break;
 			case BASEPROPERTY_STATE:
 				aProp <<= (sal_Int16) ( pButton->IsChecked() ? 1 : 0 );

File tools/inc/tools/wintypes.hxx

 #define WB_SCROLL				((WinBits)0x02000000)
 #define WB_FORCETABCYCLE		((WinBits)0x04000000)
 
-// Window-Bits for TabControl
-#define WB_SINGLELINE			((WinBits)0x02000000)
-
 // Window-Bits for DockingWindows
 #define WB_DOCKBORDER			((WinBits)0x00001000)
 

File vcl/inc/vcl/button.hxx

                        ~Button();
 
     virtual void        Click();
-    virtual void		DataChanged( const DataChangedEvent& rDCEvt );
 
     void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
     const Link&         GetClickHdl() const { return maClickHdl; }

File vcl/inc/vcl/settings.hxx

     ULONG                           mnOptions;
     USHORT                          mnScreenZoom;
     USHORT                          mnScreenFontZoom;
-    USHORT                          mnRadioButtonStyle;
-    USHORT                          mnCheckBoxStyle;
-    USHORT                          mnPushButtonStyle;
-    USHORT                          mnTabControlStyle;
     USHORT                          mnHighContrast;
     USHORT                          mnUseSystemUIFonts;
     USHORT                          mnAutoMnemonic;
 #define STYLE_OPTION_SPINARROW      ((ULONG)0x00000080)
 #define STYLE_OPTION_SPINUPDOWN     ((ULONG)0x00000100)
 #define STYLE_OPTION_NOMNEMONICS    ((ULONG)0x00000200)
-#define STYLE_OPTION_WINSTYLE       ((ULONG)0x00010000)
-#define STYLE_OPTION_OS2STYLE       ((ULONG)0x00020000)
-#define STYLE_OPTION_MACSTYLE       ((ULONG)0x00040000)
-#define STYLE_OPTION_UNIXSTYLE      ((ULONG)0x00080000)
-#define STYLE_OPTION_SYSTEMSTYLE    ((ULONG)0x000F0000)
 #define STYLE_OPTION_HIDEDISABLED   ((ULONG)0x00100000)
 
 #define DRAGFULL_OPTION_WINDOWMOVE  ((ULONG)0x00000001)
 
 #define DISPLAY_OPTION_AA_DISABLE   ((ULONG)0x00000001)
 
-#define STYLE_RADIOBUTTON_WIN       ((USHORT)0x0001)
-#define STYLE_RADIOBUTTON_OS2       ((USHORT)0x0002)
-#define STYLE_RADIOBUTTON_MAC       ((USHORT)0x0003)
-#define STYLE_RADIOBUTTON_UNIX      ((USHORT)0x0004)
-#define STYLE_RADIOBUTTON_MONO      ((USHORT)0x0005)
-#define STYLE_RADIOBUTTON_STYLE     ((USHORT)0x000F)
-
-#define STYLE_CHECKBOX_WIN          ((USHORT)0x0001)
-#define STYLE_CHECKBOX_OS2          ((USHORT)0x0002)
-#define STYLE_CHECKBOX_MAC          ((USHORT)0x0003)
-#define STYLE_CHECKBOX_UNIX         ((USHORT)0x0004)
-#define STYLE_CHECKBOX_MONO         ((USHORT)0x0005)
-#define STYLE_CHECKBOX_STYLE        ((USHORT)0x000F)
-
-#define STYLE_PUSHBUTTON_WIN        ((USHORT)0x0001)
-#define STYLE_PUSHBUTTON_OS2        ((USHORT)0x0002)
-#define STYLE_PUSHBUTTON_MAC        ((USHORT)0x0003)
-#define STYLE_PUSHBUTTON_UNIX       ((USHORT)0x0004)
-#define STYLE_PUSHBUTTON_STYLE      ((USHORT)0x000F)
-
-#define STYLE_TABCONTROL_SINGLELINE ((USHORT)0x0001)
-#define STYLE_TABCONTROL_COLOR      ((USHORT)0x0002)
+#define STYLE_RADIOBUTTON_MONO      ((USHORT)0x0001) // legacy
+#define STYLE_CHECKBOX_MONO         ((USHORT)0x0001) // legacy
 
 #define STYLE_TOOLBAR_ICONSIZE_UNKNOWN		((ULONG)0)
 #define STYLE_TOOLBAR_ICONSIZE_SMALL		((ULONG)1)
     const Font&                     GetIconFont() const
                                         { return mpData->maIconFont; }
 
-    void                            SetRadioButtonStyle( USHORT nStyle )
-                                        { CopyData(); mpData->mnRadioButtonStyle = nStyle; }
-    USHORT                          GetRadioButtonStyle() const
-                                        { return mpData->mnRadioButtonStyle; }
-    void                            SetCheckBoxStyle( USHORT nStyle )
-                                        { CopyData(); mpData->mnCheckBoxStyle = nStyle; }
-    USHORT                          GetCheckBoxStyle() const
-                                        { return mpData->mnCheckBoxStyle; }
-    void                            SetPushButtonStyle( USHORT nStyle )
-                                        { CopyData(); mpData->mnPushButtonStyle = nStyle; }
-    USHORT                          GetPushButtonStyle() const
-                                        { return mpData->mnPushButtonStyle; }
-    void                            SetTabControlStyle( USHORT nStyle )
-                                        { CopyData(); mpData->mnTabControlStyle = nStyle; }
-    USHORT                          GetTabControlStyle() const
-                                        { return mpData->mnTabControlStyle; }
-
     void                            SetBorderSize( long nSize )
                                         { CopyData(); mpData->mnBorderSize = nSize; }
     long                            GetBorderSize() const
                                         { CopyData(); mpData->maWorkspaceGradient = rWall; }
 
     void                            SetStandardStyles();
-    void                            SetStandardWinStyles();
-    void                            SetStandardOS2Styles();
-    void                            SetStandardMacStyles();
-    void                            SetStandardUnixStyles();
 
     const StyleSettings&            operator =( const StyleSettings& rSet );
 

File vcl/inc/vcl/svids.hrc

 #include "svl/solar.hrc"
 
 #define SV_RESID_STDOFFSET					0
-#define SV_RESID_WINOFFSET					1
-#define SV_RESID_OS2OFFSET					2
-#define SV_RESID_MACOFFSET					3
-#define SV_RESID_UNIXOFFSET 				4
-#define SV_RESID_MONOOFFSET 				5
+#define SV_RESID_MONOOFFSET 				1
 
 // Achtung: Diese Id's muessen min. 10 Werte auseinanderliegen, da
 // je nach Style noch ein Offset aufgerechnet wird

File vcl/inc/vcl/symbol.hxx

 #define SYMBOL_DOCK 			((SymbolType)32)
 #define SYMBOL_HIDE 			((SymbolType)33)
 #define SYMBOL_HELP 			((SymbolType)34)
-#define SYMBOL_OS2CLOSE 		((SymbolType)35)
-#define SYMBOL_OS2FLOAT 		((SymbolType)36)
-#define SYMBOL_OS2HIDE			((SymbolType)37)
 #define SYMBOL_MENU 			SYMBOL_SPIN_DOWN
 
 #define SYMBOL_NOSYMBOL 		(SYMBOL_DONTKNOW)

File vcl/inc/vcl/tabctrl.hxx

     long                mnMaxPageWidth;
     USHORT              mnActPageId;
     USHORT              mnCurPageId;
-    USHORT              mnFirstPagePos;
-    USHORT              mnLastFirstPagePos;
     BOOL                mbFormat;
     BOOL                mbRestoreHelpId;
     BOOL                mbRestoreUnqId;
-    BOOL                mbSingleLine;
-    BOOL                mbScroll;
     BOOL                mbSmallInvalidate;
     BOOL                mbExtraSpace;
     Link                maActivateHdl;
     using Control::ImplInitSettings;
     SAL_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
     SAL_DLLPRIVATE ImplTabItem* ImplGetItem( USHORT nId ) const;
-    SAL_DLLPRIVATE void         ImplScrollBtnsColor();
-    SAL_DLLPRIVATE void         ImplSetScrollBtnsState();
-    SAL_DLLPRIVATE void         ImplPosScrollBtns();
     SAL_DLLPRIVATE Size         ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth );
     SAL_DLLPRIVATE Rectangle    ImplGetTabRect( USHORT nPos, long nWidth = -1, long nHeight = -1 );
     SAL_DLLPRIVATE void         ImplChangeTabPage( USHORT nId, USHORT nOldId );
     SAL_DLLPRIVATE BOOL         ImplPosCurTabPage();
     SAL_DLLPRIVATE void         ImplActivateTabPage( BOOL bNext );
-    SAL_DLLPRIVATE void         ImplSetFirstPagePos( USHORT nPagePos );
     SAL_DLLPRIVATE void         ImplShowFocus();
     SAL_DLLPRIVATE void         ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false );
     SAL_DLLPRIVATE void			ImplPaint( const Rectangle& rRect, bool bLayout = false );
     SAL_DLLPRIVATE void			ImplFreeLayoutData();
     SAL_DLLPRIVATE long			ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
    
-    DECL_DLLPRIVATE_LINK(       ImplScrollBtnHdl, PushButton* pBtn );
     DECL_DLLPRIVATE_LINK(       ImplListBoxSelectHdl, ListBox* );
     DECL_DLLPRIVATE_LINK(       ImplWindowEventListener, VclSimpleEvent* );
 
     void                SetCurPageId( USHORT nPageId );
     USHORT              GetCurPageId() const;
 
-    void                SetFirstPageId( USHORT nPageId );
-    USHORT              GetFirstPageId() const { return GetPageId( mnFirstPagePos ); }
-
     void                SelectTabPage( USHORT nPageId );
 
     void                SetMaxPageWidth( long nMaxWidth ) { mnMaxPageWidth = nMaxWidth; }

File vcl/os2/source/window/salframe.cxx

 
     // --- Style settings ---
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-    BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0;
-
     // General settings
     LONG    nDisplayTime = PrfQueryProfileInt( HINI_PROFILE, (PSZ)aControlPanel, (PSZ)"LogoDisplayTime", -1 );
     ULONG   nSalDisplayTime;
 
     // Size settings
     aStyleSettings.SetScrollBarSize( WinQuerySysValue( HWND_DESKTOP, SV_CYHSCROLL ) );
-    if ( bCompBorder )
-    {
-        aStyleSettings.SetTitleHeight( WinQuerySysValue( HWND_DESKTOP, SV_CYTITLEBAR ) );
-    }
+    aStyleSettings.SetTitleHeight( WinQuerySysValue( HWND_DESKTOP, SV_CYTITLEBAR ) );
 
     // Color settings
-    if ( bCompBorder )
-    {
-        aStyleSettings.SetFaceColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONMIDDLE, 0 ) ) );
-        aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
-        aStyleSettings.SetLightColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONLIGHT, 0 ) ) );
-        aStyleSettings.SetLightBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONMIDDLE, 0 ) ) );
-        aStyleSettings.SetShadowColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONDARK, 0 ) ) );
-        aStyleSettings.SetDarkShadowColor( Color( COL_BLACK ) );
-        aStyleSettings.SetDialogColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_DIALOGBACKGROUND, 0 ) ) );
-        aStyleSettings.SetButtonTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
-        aStyleSettings.SetActiveColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVETITLE, 0 ) ) );
-        aStyleSettings.SetActiveTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVETITLETEXT, 0 ) ) );
-        aStyleSettings.SetActiveBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVEBORDER, 0 ) ) );
-        aStyleSettings.SetDeactiveColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVETITLE, 0 ) ) );
-        aStyleSettings.SetDeactiveTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVETITLETEXT, 0 ) ) );
-        aStyleSettings.SetDeactiveBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVEBORDER, 0 ) ) );
-        aStyleSettings.SetMenuColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENU, 0 ) ) );
-        aStyleSettings.SetMenuTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
-        aStyleSettings.SetMenuBarTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
-    }
+    aStyleSettings.SetFaceColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONMIDDLE, 0 ) ) );
+    aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
+    aStyleSettings.SetLightColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONLIGHT, 0 ) ) );
+    aStyleSettings.SetLightBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONMIDDLE, 0 ) ) );
+    aStyleSettings.SetShadowColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_BUTTONDARK, 0 ) ) );
+    aStyleSettings.SetDarkShadowColor( Color( COL_BLACK ) );
+    aStyleSettings.SetDialogColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_DIALOGBACKGROUND, 0 ) ) );
+    aStyleSettings.SetButtonTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
+    aStyleSettings.SetActiveColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVETITLE, 0 ) ) );
+    aStyleSettings.SetActiveTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVETITLETEXT, 0 ) ) );
+    aStyleSettings.SetActiveBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_ACTIVEBORDER, 0 ) ) );
+    aStyleSettings.SetDeactiveColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVETITLE, 0 ) ) );
+    aStyleSettings.SetDeactiveTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVETITLETEXT, 0 ) ) );
+    aStyleSettings.SetDeactiveBorderColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_INACTIVEBORDER, 0 ) ) );
+    aStyleSettings.SetMenuColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENU, 0 ) ) );
+    aStyleSettings.SetMenuTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
+    aStyleSettings.SetMenuBarTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUTEXT, 0 ) ) );
     aStyleSettings.SetDialogTextColor( aStyleSettings.GetButtonTextColor() );
     aStyleSettings.SetRadioCheckTextColor( aStyleSettings.GetButtonTextColor() );
     aStyleSettings.SetGroupTextColor( ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_WINDOWSTATICTEXT, 0 ) ) );
     Color aMenuHighColor = ImplOS2ColorToSal( WinQuerySysColor( HWND_DESKTOP, SYSCLR_MENUHILITEBGND, 0 ) );
     if ( ImplSalIsSameColor( aMenuHighColor, aStyleSettings.GetMenuColor() ) )
     {
-        if ( bCompBorder )
-        {
-            aStyleSettings.SetMenuHighlightColor( Color( COL_BLUE ) );
-            aStyleSettings.SetMenuHighlightTextColor( Color( COL_WHITE ) );
-        }
+        aStyleSettings.SetMenuHighlightColor( Color( COL_BLUE ) );
+        aStyleSettings.SetMenuHighlightTextColor( Color( COL_WHITE ) );
     }
     else
     {

File vcl/source/app/settings.cxx

     mnCursorBlinkTime           = STYLE_CURSOR_NOBLINKTIME;
     mnScreenZoom                = 100;
     mnScreenFontZoom            = 100;
-    mnRadioButtonStyle          = 0;
-    mnCheckBoxStyle             = 0;
-    mnPushButtonStyle           = 0;
-    mnTabControlStyle           = 0;
     mnLogoDisplayTime           = LOGO_DISPLAYTIME_STARTTIME;
     mnDragFullOptions           = DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE |
                                   DRAGFULL_OPTION_OBJECTMOVE | DRAGFULL_OPTION_OBJECTSIZE |
     mnCursorBlinkTime           = rData.mnCursorBlinkTime;
     mnScreenZoom                = rData.mnScreenZoom;
     mnScreenFontZoom            = rData.mnScreenFontZoom;
-    mnRadioButtonStyle          = rData.mnRadioButtonStyle;
-    mnCheckBoxStyle             = rData.mnCheckBoxStyle;
-    mnPushButtonStyle           = rData.mnPushButtonStyle;
-    mnTabControlStyle           = rData.mnTabControlStyle;
     mnLogoDisplayTime           = rData.mnLogoDisplayTime;
     mnDragFullOptions           = rData.mnDragFullOptions;
     mnAnimationOptions          = rData.mnAnimationOptions;
     maHighlightLinkColor        = Color( COL_LIGHTBLUE );
 	maFontColor					= Color( COL_BLACK );
 
-    mnRadioButtonStyle         &= ~STYLE_RADIOBUTTON_STYLE;
-    mnCheckBoxStyle            &= ~STYLE_CHECKBOX_STYLE;
-    mnPushButtonStyle          &= ~STYLE_PUSHBUTTON_STYLE;
-    mnTabControlStyle           = 0;
-
-    mnOptions                  &= ~(STYLE_OPTION_SYSTEMSTYLE | STDSYS_STYLE);
     mnBorderSize                = 1;
     mnTitleHeight               = 18;
     mnFloatTitleHeight          = 13;
 
 // -----------------------------------------------------------------------
 
-void StyleSettings::SetStandardWinStyles()
-{
-    return; // no more style changes since NWF
-}
-
-// -----------------------------------------------------------------------
-
-void StyleSettings::SetStandardOS2Styles()
-{
-    return; // no more style changes since NWF
-}
-
-// -----------------------------------------------------------------------
-
-void StyleSettings::SetStandardMacStyles()
-{
-    return; // no more style changes since NWF
-}
-
-// -----------------------------------------------------------------------
-
-void StyleSettings::SetStandardUnixStyles()
-{
-    return; // no more style changes since NWF
-}
-
-// -----------------------------------------------------------------------
-
 Color StyleSettings::GetFaceGradientColor() const
 {
     // compute a brighter face color that can be used in gradients
          (mpData->mnAntialiasedMin          == rSet.mpData->mnAntialiasedMin)           &&
          (mpData->mnScreenZoom              == rSet.mpData->mnScreenZoom)               &&
          (mpData->mnScreenFontZoom          == rSet.mpData->mnScreenFontZoom)           &&
-         (mpData->mnRadioButtonStyle        == rSet.mpData->mnRadioButtonStyle)         &&
-         (mpData->mnCheckBoxStyle           == rSet.mpData->mnCheckBoxStyle)            &&
-         (mpData->mnPushButtonStyle         == rSet.mpData->mnPushButtonStyle)          &&
-         (mpData->mnTabControlStyle         == rSet.mpData->mnTabControlStyle)          &&
          (mpData->mnHighContrast			== rSet.mpData->mnHighContrast)             &&
          (mpData->mnUseSystemUIFonts		== rSet.mpData->mnUseSystemUIFonts)         &&
          (mpData->mnUseFlatBorders   		== rSet.mpData->mnUseFlatBorders)           &&

File vcl/source/control/button.cxx

 }
 
 // -----------------------------------------------------------------------
-void Button::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    Control::DataChanged( rDCEvt );
-
-	// The flag SETTINGS_IN_UPDATE_SETTINGS is set when the settings changed due to a
-	// Application::SettingsChanged event. In this scenario we want to keep the style settings
-	// of our radio buttons and our check boxes.
-	if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) &&
-		 ( rDCEvt.GetFlags() & SETTINGS_IN_UPDATE_SETTINGS ) )
-
-	{
-		const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
-		if ( pOldSettings )
-		{
-			BOOL bResetStyleSettings = FALSE;
-			AllSettings aAllSettings = GetSettings();
-			StyleSettings aStyleSetting = aAllSettings.GetStyleSettings();
-
-			USHORT nCheckBoxStyle = aStyleSetting.GetCheckBoxStyle();
-			if ( nCheckBoxStyle != pOldSettings->GetStyleSettings().GetCheckBoxStyle() )
-			{
-				aStyleSetting.SetCheckBoxStyle( pOldSettings->GetStyleSettings().GetCheckBoxStyle() );
-				bResetStyleSettings = TRUE;
-			}
-
-			USHORT nRadioButtonStyle = aStyleSetting.GetRadioButtonStyle();
-			if ( nRadioButtonStyle != pOldSettings->GetStyleSettings().GetRadioButtonStyle() )
-			{
-				aStyleSetting.SetRadioButtonStyle( pOldSettings->GetStyleSettings().GetRadioButtonStyle() );
-				bResetStyleSettings = TRUE;
-			}
-
-			if ( bResetStyleSettings )
-			{
-				aAllSettings.SetStyleSettings( pOldSettings->GetStyleSettings() );
-				SetSettings( aAllSettings );
-			}
-		}
-	}
-}
-
 void Button::SetSmallSymbol (bool small)
 {
     ImplSetSmallSymbol (small);
         StyleSettings aStyleSettings = pDev->GetSettings().GetStyleSettings();
         if ( pDev->IsControlBackground() )
             aStyleSettings.Set3DColors( pDev->GetControlBackground() );
-
-        USHORT nPushButtonSysStyle = aStyleSettings.GetPushButtonStyle() & STYLE_PUSHBUTTON_STYLE;
-        if ( nPushButtonSysStyle == STYLE_PUSHBUTTON_MAC )
-        {
-            pDev->SetLineColor();
-            pDev->SetFillColor( aStyleSettings.GetFaceColor() );
-            pDev->DrawRect( rRect );
-
-            if ( (aStyleSettings.GetOptions() & STYLE_OPTION_MONO) ||
-                 (pDev->GetOutDevType() == OUTDEV_PRINTER) )
-                nStyle |= BUTTON_DRAW_MONO;
-
-            if ( nStyle & BUTTON_DRAW_DEFAULT )
-            {
-                if ( nStyle & BUTTON_DRAW_MONO )
-                    pDev->SetLineColor( Color( COL_BLACK ) );
-                else
-                    pDev->SetLineColor( aStyleSettings.GetDarkShadowColor() );
-
-                pDev->DrawLine( Point( rRect.Left()+3, rRect.Top() ),
-                                Point( rRect.Right()-3, rRect.Top() ) );
-                pDev->DrawLine( Point( rRect.Left()+3, rRect.Bottom() ),
-                                Point( rRect.Right()-3, rRect.Bottom() ) );
-                pDev->DrawLine( Point( rRect.Left(), rRect.Top()+3 ),
-                                Point( rRect.Left(), rRect.Bottom()-3 ) );
-                pDev->DrawLine( Point( rRect.Right(), rRect.Top()+3 ),
-                                Point( rRect.Right(), rRect.Bottom()-3 ) );
-                pDev->DrawPixel( Point( rRect.Left()+2, rRect.Top()+1 ) );
-                pDev->DrawPixel( Point( rRect.Left()+1, rRect.Top()+2 ) );
-                pDev->DrawPixel( Point( rRect.Right()-2, rRect.Top()+1 ) );
-                pDev->DrawPixel( Point( rRect.Right()-1, rRect.Top()+2 ) );
-                pDev->DrawPixel( Point( rRect.Left()+2, rRect.Bottom()-1 ) );
-                pDev->DrawPixel( Point( rRect.Left()+1, rRect.Bottom()-2 ) );
-                pDev->DrawPixel( Point( rRect.Right()-2, rRect.Bottom()-1 ) );
-                pDev->DrawPixel( Point( rRect.Right()-1, rRect.Bottom()-2 ) );
-
-                if ( nStyle & BUTTON_DRAW_MONO )
-                    pDev->SetLineColor( Color( COL_BLACK ) );
-                else
-                    pDev->SetLineColor( aStyleSettings.GetShadowColor() );
-                pDev->DrawLine( Point( rRect.Left()+3, rRect.Bottom()-1 ),
-                                Point( rRect.Right()-3, rRect.Bottom()-1 ) );
-                pDev->DrawLine( Point( rRect.Right()-1, rRect.Top()+3 ),
-                                Point( rRect.Right()-1, rRect.Bottom()-3 ) );
-                pDev->DrawPixel( Point( rRect.Right()-3, rRect.Bottom()-2 ) );
-                pDev->DrawPixel( Point( rRect.Right()-2, rRect.Bottom()-2 ) );
-                pDev->DrawPixel( Point( rRect.Right()-2, rRect.Bottom()-3 ) );
-            }
-
-            rRect.Left()   += 2;
-            rRect.Top()    += 2;
-            rRect.Right()  -= 2;
-            rRect.Bottom() -= 2;
-
-            if ( nStyle & BUTTON_DRAW_MONO )
-                pDev->SetLineColor( Color( COL_BLACK ) );
-            else
-                pDev->SetLineColor( aStyleSettings.GetDarkShadowColor() );
-
-            pDev->DrawLine( Point( rRect.Left()+2, rRect.Top() ),
-                            Point( rRect.Right()-2, rRect.Top() ) );
-            pDev->DrawLine( Point( rRect.Left()+2, rRect.Bottom() ),
-                            Point( rRect.Right()-2, rRect.Bottom() ) );
-            pDev->DrawLine( Point( rRect.Left(), rRect.Top()+2 ),
-                            Point( rRect.Left(), rRect.Bottom()-2 ) );
-            pDev->DrawLine( Point( rRect.Right(), rRect.Top()+2 ),
-                            Point( rRect.Right(), rRect.Bottom()-2 ) );
-            pDev->DrawPixel( Point( rRect.Left()+1, rRect.Top()+1 ) );
-            pDev->DrawPixel( Point( rRect.Right()-1, rRect.Top()+1 ) );
-            pDev->DrawPixel( Point( rRect.Left()+1, rRect.Bottom()-1 ) );
-            pDev->DrawPixel( Point( rRect.Right()-1, rRect.Bottom()-1 ) );
-
-            pDev->SetLineColor();
-            if ( nStyle & BUTTON_DRAW_CHECKED )
-                pDev->SetFillColor( aStyleSettings.GetCheckedColor() );
-            else
-                pDev->SetFillColor( aStyleSettings.GetFaceColor() );
-            pDev->DrawRect( Rectangle( rRect.Left()+2, rRect.Top()+2, rRect.Right()-2, rRect.Bottom()-2 ) );
-
-            if ( !(nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED)) )
-            {
-                if ( nStyle & BUTTON_DRAW_MONO )
-                    pDev->SetLineColor( Color( COL_BLACK ) );
-                else
-                    pDev->SetLineColor( aStyleSettings.GetShadowColor() );
-                pDev->DrawLine( Point( rRect.Left()+2, rRect.Bottom()-1 ),
-                                Point( rRect.Right()-2, rRect.Bottom()-1 ) );
-                pDev->DrawLine( Point( rRect.Right()-1, rRect.Top()+2 ),
-                                Point( rRect.Right()-1, rRect.Bottom()-2 ) );
-                pDev->DrawPixel( Point( rRect.Right()-2, rRect.Bottom()-2 ) );
-                pDev->SetLineColor( aStyleSettings.GetLightColor() );
-            }
-            else
-                pDev->SetLineColor( aStyleSettings.GetShadowColor() );
-
-            if ( !(nStyle & BUTTON_DRAW_MONO) )
-            {
-                pDev->DrawLine( Point( rRect.Left()+2, rRect.Top()+1 ),
-                                Point( rRect.Right()-2, rRect.Top()+1 ) );
-                pDev->DrawLine( Point( rRect.Left()+1, rRect.Top()+2 ),
-                                Point( rRect.Left()+1, rRect.Bottom()-2 ) );
-                pDev->DrawPixel( Point( rRect.Top()+2, rRect.Right()+2 ) );
-            }
-
-            rRect.Left()   += 2;
-            rRect.Top()    += 2;
-            rRect.Right()  -= 2;
-            rRect.Bottom() -= 2;
-
-            if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
-            {
-                rRect.Left()++;
-                rRect.Top()++;
-                rRect.Right()++;
-                rRect.Bottom()++;
-            }
-
-            return;
-        }
     }
 
     DecorationView aDecoView( pDev );
     Point       aTempPoint;
     Rectangle   aTestRect( aTempPoint, pDev->GetOutputSizePixel() );
 
-    if ( !(pDev->GetStyle() & (WB_RECTSTYLE | WB_SMALLSTYLE)) )
-    {
-        const StyleSettings& rStyleSettings = pDev->GetSettings().GetStyleSettings();
-
-        USHORT nPushButtonSysStyle = rStyleSettings.GetPushButtonStyle() & STYLE_PUSHBUTTON_STYLE;
-        if ( nPushButtonSysStyle == STYLE_PUSHBUTTON_MAC )
-        {
-            aTestRect.Left()    += 2;
-            aTestRect.Top()     += 2;
-            aTestRect.Right()   -= 2;
-            aTestRect.Bottom()  -= 2;
-        }
-    }
-
     return aTestRect.IsInside( rPos );
 }
 
 {
     ImplSVData*             pSVData = ImplGetSVData();
     const StyleSettings&    rStyleSettings = rSettings.GetStyleSettings();
-    USHORT                  nStyle = rStyleSettings.GetRadioButtonStyle() & STYLE_RADIOBUTTON_STYLE;
+    USHORT                  nStyle = 0;
 
     if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO )
         nStyle = STYLE_RADIOBUTTON_MONO;
 {
     ImplSVData*             pSVData = ImplGetSVData();
     const StyleSettings&    rStyleSettings = rSettings.GetStyleSettings();
-    USHORT                  nStyle = rStyleSettings.GetCheckBoxStyle() & STYLE_CHECKBOX_STYLE;
+    USHORT                  nStyle = 0;
 
     if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO )
         nStyle = STYLE_CHECKBOX_MONO;

File vcl/source/control/menubtn.cxx

 		Point aPos( 0, 1 );
 		Size aSize = GetSizePixel();
 		Rectangle aRect( aPos, aSize );
-		const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-		if ( !((GetStyle() & (WB_RECTSTYLE | WB_SMALLSTYLE)) ||
-			 !(rStyleSettings.GetOptions() & STYLE_OPTION_MACSTYLE)) )
-		{
-			aRect.Left()	+= 2;
-			aRect.Top() 	+= 2;
-			aRect.Right()	-= 2;
-			aRect.Bottom()	-= 2;
-		}
 		SetPressed( TRUE );
 		EndSelection();
 		mnCurItemId = mpMenu->Execute( this, aRect, POPUPMENU_EXECUTE_DOWN );

File vcl/source/control/scrbar.cxx

             if ( bEnabled )
             {
                 nStyle = BUTTON_DRAW_NOLIGHTBORDER;
-                // pressed thumbs only in OS2 style
-                if ( rStyleSettings.GetOptions() & STYLE_OPTION_OS2STYLE )
-                    if ( mnStateFlags & SCRBAR_STATE_THUMB_DOWN )
-                        nStyle |= BUTTON_DRAW_PRESSED;
                 aTempRect = aDecoView.DrawButton( maThumbRect, nStyle );
-                // OS2 style requires pattern on the thumb
-                if ( rStyleSettings.GetOptions() & STYLE_OPTION_OS2STYLE )
-                {
-                    if ( GetStyle() & WB_HORZ )
-                    {
-                        if ( aTempRect.GetWidth() > 6 )
-                        {
-                            long nX = aTempRect.Center().X();
-                            nX -= 6;
-                            if ( nX < aTempRect.Left() )
-                                nX = aTempRect.Left();
-                            for ( int i = 0; i < 6; i++ )
-                            {
-                                if ( nX > aTempRect.Right()-1 )
-                                    break;
-
-                                pOutDev->SetLineColor( rStyleSettings.GetButtonTextColor() );
-                                pOutDev->DrawLine( Point( nX, aTempRect.Top()+1 ),
-                                          Point( nX, aTempRect.Bottom()-1 ) );
-                                nX++;
-                                pOutDev->SetLineColor( rStyleSettings.GetLightColor() );
-                                pOutDev->DrawLine( Point( nX, aTempRect.Top()+1 ),
-                                          Point( nX, aTempRect.Bottom()-1 ) );
-                                nX++;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if ( aTempRect.GetHeight() > 6 )
-                        {
-                            long nY = aTempRect.Center().Y();
-                            nY -= 6;
-                            if ( nY < aTempRect.Top() )
-                                nY = aTempRect.Top();
-                            for ( int i = 0; i < 6; i++ )
-                            {
-                                if ( nY > aTempRect.Bottom()-1 )
-                                    break;
-
-                                pOutDev->SetLineColor( rStyleSettings.GetButtonTextColor() );
-                                pOutDev->DrawLine( Point( aTempRect.Left()+1, nY ),
-                                          Point( aTempRect.Right()-1, nY ) );
-                                nY++;
-                                pOutDev->SetLineColor( rStyleSettings.GetLightColor() );
-                                pOutDev->DrawLine( Point( aTempRect.Left()+1, nY ),
-                                          Point( aTempRect.Right()-1, nY ) );
-                                nY++;
-                            }
-                        }
-                    }
-                    pOutDev->SetLineColor();
-                }
             }
             else
             {

File vcl/source/control/slider.cxx

 				mnMouseOff = rMousePos.X()-aCenterPos.X();
 			else
 				mnMouseOff = rMousePos.Y()-aCenterPos.Y();
-
-			// Im OS2-Look geben wir den Thumb gedrueckt aus
-			if ( GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_OS2STYLE )
-			{
-				mnStateFlags |= SLIDER_STATE_THUMB_DOWN;
-				ImplDraw( SLIDER_DRAW_THUMB );
-			}
 		}
 		else if ( ImplIsPageUp( rMousePos ) )
 		{

File vcl/source/control/tabctrl.cxx

 
 struct ImplTabCtrlData
 {
-    PushButton*						mpLeftBtn;
-    PushButton*						mpRightBtn;
     std::hash_map< int, int >		maLayoutPageIdToLine;
     std::hash_map< int, int >		maLayoutLineToPageId;
     std::vector< Rectangle >		maTabRectangles;
 
 // -----------------------------------------------------------------------
 
-#if 0
-// not used
-#define TABCOLORCOUNT   10
-
-static ColorData aImplTabColorAry[TABCOLORCOUNT] =
-{
-    RGB_COLORDATA(  80, 216, 248 ),
-    RGB_COLORDATA( 128, 216, 168 ),
-    RGB_COLORDATA( 128, 144, 248 ),
-    RGB_COLORDATA( 208, 180, 168 ),
-    RGB_COLORDATA( 248, 252, 168 ),
-    RGB_COLORDATA( 168, 144, 168 ),
-    RGB_COLORDATA( 248, 144,  80 ),
-    RGB_COLORDATA( 248, 216,  80 ),
-    RGB_COLORDATA( 248, 180, 168 ),
-    RGB_COLORDATA( 248, 216, 168 )
-};
-#endif
-
-// -----------------------------------------------------------------------
-
 #define TAB_OFFSET          3
 #define TAB_TABOFFSET_X     3
 #define TAB_TABOFFSET_Y     3
     if ( !(nStyle & WB_NODIALOGCONTROL) )
         nStyle |= WB_DIALOGCONTROL;
 
-    // no single line tabs since NWF
-    nStyle &= ~WB_SINGLELINE;
-
     Control::ImplInit( pParent, nStyle, NULL );
 
     mnLastWidth         		= 0;
     mnMaxPageWidth      		= 0;
     mnActPageId         		= 0;
     mnCurPageId         		= 0;
-    mnFirstPagePos      		= 0;
-    mnLastFirstPagePos  		= 0;
     mbFormat            		= TRUE;
     mbRestoreHelpId     		= FALSE;
     mbRestoreUnqId      		= FALSE;
-    mbSingleLine        		= FALSE;
-    mbScroll            		= FALSE;
     mbSmallInvalidate   		= FALSE;
     mbExtraSpace        		= FALSE;
     mpTabCtrlData               = new ImplTabCtrlData;
-    mpTabCtrlData->mpLeftBtn    = NULL;
-    mpTabCtrlData->mpRightBtn   = NULL;
     mpTabCtrlData->mpListBox    = NULL;
 
 
                 SetBackground( pParent->GetBackground() );
         }
     }
-
-    ImplScrollBtnsColor();
 }
 
 // -----------------------------------------------------------------------
     {
         if( mpTabCtrlData->mpListBox )
             delete mpTabCtrlData->mpListBox;
-        if ( mpTabCtrlData->mpLeftBtn )
-            delete mpTabCtrlData->mpLeftBtn;
-        if ( mpTabCtrlData->mpRightBtn )
-            delete mpTabCtrlData->mpRightBtn;
         delete mpTabCtrlData;
     }
 }
 
 // -----------------------------------------------------------------------
 
-void TabControl::ImplScrollBtnsColor()
-{
-    if ( mpTabCtrlData && mpTabCtrlData->mpLeftBtn )
-    {
-        mpTabCtrlData->mpLeftBtn->SetControlForeground();
-        mpTabCtrlData->mpRightBtn->SetControlForeground();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void TabControl::ImplSetScrollBtnsState()
-{
-    if ( mbScroll )
-    {
-        mpTabCtrlData->mpLeftBtn->Enable( mnFirstPagePos != 0 );
-        mpTabCtrlData->mpRightBtn->Enable( mnFirstPagePos < mnLastFirstPagePos );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void TabControl::ImplPosScrollBtns()
-{
-    if ( mbScroll )
-    {
-        if ( !mpTabCtrlData->mpLeftBtn )
-        {
-            mpTabCtrlData->mpLeftBtn = new PushButton( this, WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOPOINTERFOCUS | WB_REPEAT );
-            mpTabCtrlData->mpLeftBtn->SetSymbol( SYMBOL_PREV );
-            mpTabCtrlData->mpLeftBtn->SetClickHdl( LINK( this, TabControl, ImplScrollBtnHdl ) );
-        }
-        if ( !mpTabCtrlData->mpRightBtn )
-        {
-            mpTabCtrlData->mpRightBtn = new PushButton( this, WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOPOINTERFOCUS | WB_REPEAT );
-            mpTabCtrlData->mpRightBtn->SetSymbol( SYMBOL_NEXT );
-            mpTabCtrlData->mpRightBtn->SetClickHdl( LINK( this, TabControl, ImplScrollBtnHdl ) );
-        }
-
-        Rectangle aRect = ImplGetTabRect( TAB_PAGERECT );
-        aRect.Left()   -= TAB_OFFSET;
-        aRect.Top()    -= TAB_OFFSET;
-        aRect.Right()  += TAB_OFFSET;
-        aRect.Bottom() += TAB_OFFSET;
-        long nX = aRect.Right()-mnBtnSize+1;
-        long nY = aRect.Top()-mnBtnSize;
-        mpTabCtrlData->mpRightBtn->SetPosSizePixel( nX, nY, mnBtnSize, mnBtnSize );
-        nX -= mnBtnSize;
-        mpTabCtrlData->mpLeftBtn->SetPosSizePixel( nX, nY, mnBtnSize, mnBtnSize );
-        ImplScrollBtnsColor();
-        ImplSetScrollBtnsState();
-        mpTabCtrlData->mpLeftBtn->Show();
-        mpTabCtrlData->mpRightBtn->Show();
-    }
-    else
-    {
-        if ( mpTabCtrlData )
-        {
-            if ( mpTabCtrlData->mpLeftBtn )
-                mpTabCtrlData->mpLeftBtn->Hide();
-            if ( mpTabCtrlData->mpRightBtn )
-                mpTabCtrlData->mpRightBtn->Hide();
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
 Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth )
 {
     pItem->maFormatText = pItem->maText;
             nMaxWidth = mnMaxPageWidth;
         nMaxWidth -= GetItemsOffset().X();
 
-        mbScroll = FALSE;
-
         USHORT          nLines = 0;
         USHORT          nCurLine = 0;
         long            nLineWidthAry[100];
         mnLastWidth     = nWidth;
         mnLastHeight    = nHeight;
         mbFormat        = FALSE;
-
-        ImplPosScrollBtns();
     }
 
     return size_t(nItemPos) < mpTabCtrlData->maItemList.size() ? mpTabCtrlData->maItemList[nItemPos].maRect : Rectangle();
 
 // -----------------------------------------------------------------------
 
-void TabControl::ImplSetFirstPagePos( USHORT )
-{
-    return; // was only required for single line
-}
-
-// -----------------------------------------------------------------------
-
 void TabControl::ImplShowFocus()
 {
     if ( !GetPageCount() || mpTabCtrlData->mpListBox )
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( TabControl, ImplScrollBtnHdl, PushButton*, EMPTYARG )
-{
-    ImplSetScrollBtnsState();
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 IMPL_LINK( TabControl, ImplListBoxSelectHdl, ListBox*, EMPTYARG )
 {
     SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) );
     // Feststellen, was invalidiert werden muss
     Size aNewSize = Control::GetOutputSizePixel();
     long nNewWidth = aNewSize.Width();
-    if ( mbScroll )
-        mbSmallInvalidate = FALSE;
-    else
+    for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
+         it != mpTabCtrlData->maItemList.end(); ++it )
     {
-        for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
-             it != mpTabCtrlData->maItemList.end(); ++it )
+        if ( !it->mbFullVisible ||
+             (it->maRect.Right()-2 >= nNewWidth) )
         {
-            if ( !it->mbFullVisible ||
-                 (it->maRect.Right()-2 >= nNewWidth) )
-            {
-                mbSmallInvalidate = FALSE;
-                break;
-            }
+            mbSmallInvalidate = FALSE;
+            break;
         }
     }
 
 
 // -----------------------------------------------------------------------
 
-void TabControl::SetFirstPageId( USHORT )
-{
-    return; // was only required for single line
-}
-
-// -----------------------------------------------------------------------
-
 void TabControl::SelectTabPage( USHORT nPageId )
 {
     if ( nPageId && (nPageId != mnCurPageId) )

File vcl/source/src/images.src

 	File = "check.bmp";
 };
 
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET)
-{
-	File = "checkwin.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET)
-{
-	File = "checkos2.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET)
-{
-	File = "checkmac.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET)
-{
-	File = "checkunx.bmp";
-};
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 {
 	File = "radio.bmp";
 };
 
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET)
-{
-	File = "radiowin.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET)
-{
-	File = "radioos2.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET)
-{
-	File = "radiomac.bmp";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET)
-{
-	File = "radiounx.bmp";
-};
-
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
 {
 	File = "radiomono.bmp";

File vcl/source/window/decoview.cxx

 
 // =======================================================================
 
-void ImplDrawOS2Symbol( OutputDevice* pDev, const Rectangle& rRect,
-						USHORT nStyle, BOOL bClose )
-{
-	DecorationView			aView( pDev );
-	const StyleSettings&	rStyleSettings = pDev->GetSettings().GetStyleSettings();
-	Rectangle				aRect = rRect;
-	Color					aColor1;
-	Color					aColor2;
-
-	pDev->SetFillColor();
-
-	if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
-	{
-		aColor1 = rStyleSettings.GetShadowColor();
-		aColor2 = rStyleSettings.GetLightColor();
-	}
-	else
-	{
-		aColor1 = rStyleSettings.GetLightColor();
-		aColor2 = rStyleSettings.GetShadowColor();
-	}
-	aView.DrawFrame( aRect, aColor1, aColor2 );
-
-	aRect.Left()	+= 2;
-	aRect.Top() 	+= 2;
-	aRect.Right()	-= 2;
-	aRect.Bottom()	-= 2;
-
-	if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
-		pDev->SetLineColor( rStyleSettings.GetLightColor() );
-	else
-		pDev->SetLineColor( rStyleSettings.GetShadowColor() );
-	if ( bClose )
-	{
-		pDev->DrawLine( aRect.TopLeft(), Point( aRect.Left(), aRect.Bottom()-2 ) );
-		pDev->DrawLine( aRect.TopLeft(), Point( aRect.Right()-2, aRect.Top() ) );
-		pDev->DrawLine( Point( aRect.Left()+2, aRect.Bottom()-1 ),
-						Point( aRect.Right()-1, aRect.Top()+2 ) );
-	}
-	else
-	{
-		pDev->DrawLine( aRect.TopLeft(), aRect.BottomLeft() );
-		pDev->DrawLine( aRect.TopLeft(), Point( aRect.Right()-1, aRect.Top() ) );
-	}
-
-	if ( nStyle & (BUTTON_DRAW_PRESSED | BUTTON_DRAW_CHECKED) )
-		pDev->SetLineColor( rStyleSettings.GetShadowColor() );
-	else
-		pDev->SetLineColor( rStyleSettings.GetLightColor() );
-	if ( bClose )
-	{
-		pDev->DrawLine( Point( aRect.Right(), aRect.Top()+2 ), aRect.BottomRight() );
-		pDev->DrawLine( Point( aRect.Left()+2, aRect.Bottom() ), aRect.BottomRight() );
-		pDev->DrawLine( Point( aRect.Right()-2, aRect.Top()+1 ),
-						Point( aRect.Left()+1, aRect.Bottom()-2 ) );
-	}
-	else
-	{
-		pDev->DrawLine( aRect.TopRight(), aRect.BottomRight() );
-		pDev->DrawLine( Point( aRect.Left()+1, aRect.Bottom() ), aRect.BottomRight() );
-	}
-}
-
-// =======================================================================
-
 static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
 							SymbolType eType  )
 {
 			pDev->DrawRect( aRect );
 			}
 			break;
-
-		case SYMBOL_OS2CLOSE:
-			{
-			Rectangle aRect( nCenterX-n2, nCenterY-n2,
-							 nCenterX+n2, nCenterY+n2 );
-			ImplDrawOS2Symbol( pDev, aRect, 0, TRUE );
-			}
-			break;
-
-		case SYMBOL_OS2FLOAT:
-			{
-			Rectangle aRect( nCenterX-n2+4, nCenterY-n2+4,
-							 nCenterX+n2-4, nCenterY+n2-3 );
-			ImplDrawOS2Symbol( pDev, aRect, 0, FALSE );
-			DecorationView aDecoView( pDev );
-			Rectangle aRect2( nCenterX-n2, nCenterY-n2,
-							  nCenterX-n2+2, nCenterY+n2 );
-			aDecoView.DrawFrame( aRect2,
-								 pDev->GetSettings().GetStyleSettings().GetLightColor(),
-								 pDev->GetSettings().GetStyleSettings().GetShadowColor() );
-			Rectangle aRect3( nCenterX+n2-2, nCenterY-n2,
-							  nCenterX+n2, nCenterY+n2 );
-			aDecoView.DrawFrame( aRect3,
-								 pDev->GetSettings().GetStyleSettings().GetLightColor(),
-								 pDev->GetSettings().GetStyleSettings().GetShadowColor() );
-			}
-			break;
-
-		case SYMBOL_OS2HIDE:
-			{
-			Rectangle aRect( nCenterX-n2+3, nCenterY-n2+3,
-							 nCenterX+n2-3, nCenterY+n2-3 );
-			ImplDrawOS2Symbol( pDev, aRect, 0, FALSE );
-			}
-			break;
 	}
 }
 

File vcl/win/source/window/salframe.cxx

     }
 
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
-    BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0;
     // TODO: once those options vanish: just set bCompBorder to TRUE
     // to have the system colors read
     aStyleSettings.SetScrollBarSize( GetSystemMetrics( SM_CXVSCROLL ) );
     aStyleSettings.SetSpinSize( GetSystemMetrics( SM_CXVSCROLL ) );
     aStyleSettings.SetCursorBlinkTime( GetCaretBlinkTime() );
-    if ( bCompBorder )
-    {
-        aStyleSettings.SetFloatTitleHeight( GetSystemMetrics( SM_CYSMCAPTION ) );
-        aStyleSettings.SetTitleHeight( GetSystemMetrics( SM_CYCAPTION ) );
-        aStyleSettings.SetActiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVEBORDER ) ) );
-        aStyleSettings.SetDeactiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVEBORDER ) ) );
-        if ( aSalShlData.mnVersion >= 410 )
-        {
-            aStyleSettings.SetActiveColor2( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTACTIVECAPTION ) ) );
-            aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTINACTIVECAPTION ) ) );
-        }
-        aStyleSettings.SetFaceColor( ImplWinColorToSal( GetSysColor( COLOR_3DFACE ) ) );
-        aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
-        aStyleSettings.SetLightColor( ImplWinColorToSal( GetSysColor( COLOR_3DHILIGHT ) ) );
-        aStyleSettings.SetLightBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DLIGHT ) ) );
-        aStyleSettings.SetShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) );
-        aStyleSettings.SetDarkShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DDKSHADOW ) ) );
-    }
+    aStyleSettings.SetFloatTitleHeight( GetSystemMetrics( SM_CYSMCAPTION ) );
+    aStyleSettings.SetTitleHeight( GetSystemMetrics( SM_CYCAPTION ) );
+    aStyleSettings.SetActiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVEBORDER ) ) );
+    aStyleSettings.SetDeactiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVEBORDER ) ) );
+    if ( aSalShlData.mnVersion >= 410 )
+    {
+        aStyleSettings.SetActiveColor2( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTACTIVECAPTION ) ) );
+        aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTINACTIVECAPTION ) ) );
+    }
+    aStyleSettings.SetFaceColor( ImplWinColorToSal( GetSysColor( COLOR_3DFACE ) ) );
+    aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
+    aStyleSettings.SetLightColor( ImplWinColorToSal( GetSysColor( COLOR_3DHILIGHT ) ) );
+    aStyleSettings.SetLightBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DLIGHT ) ) );
+    aStyleSettings.SetShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) );
+    aStyleSettings.SetDarkShadowColor( ImplWinColorToSal( GetSysColor( COLOR_3DDKSHADOW ) ) );
     aStyleSettings.SetWorkspaceColor( ImplWinColorToSal( GetSysColor( COLOR_APPWORKSPACE ) ) );
     aStyleSettings.SetHelpColor( ImplWinColorToSal( GetSysColor( COLOR_INFOBK ) ) );
     aStyleSettings.SetHelpTextColor( ImplWinColorToSal( GetSysColor( COLOR_INFOTEXT ) ) );
     aStyleSettings.SetHighlightTextColor( ImplWinColorToSal( GetSysColor( COLOR_HIGHLIGHTTEXT ) ) );
     aStyleSettings.SetMenuHighlightColor( aStyleSettings.GetHighlightColor() );
     aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetHighlightTextColor() );
+
     ImplSVData* pSVData = ImplGetSVData();
     pSVData->maNWFData.mnMenuFormatExtraBorder = 0;
     pSVData->maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT );
     GetSalData()->mbThemeMenuSupport = FALSE;
-    if ( bCompBorder )
-    {
-        aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU ) ) );
-        aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() );
-        aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overriden below for flat menus
-        aStyleSettings.SetUseFlatBorders( FALSE );
-        aStyleSettings.SetUseFlatMenues( FALSE );
-        aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
-        aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
-        aStyleSettings.SetActiveColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVECAPTION ) ) );
-        aStyleSettings.SetActiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_CAPTIONTEXT ) ) );
-        aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTION ) ) );
-        aStyleSettings.SetDeactiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTIONTEXT ) ) );
-        if ( aSalShlData.mbWXP )
+    aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU ) ) );
+    aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() );
+    aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overriden below for flat menus
+    aStyleSettings.SetUseFlatBorders( FALSE );
+    aStyleSettings.SetUseFlatMenues( FALSE );
+    aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
+    aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
+    aStyleSettings.SetActiveColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVECAPTION ) ) );
+    aStyleSettings.SetActiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_CAPTIONTEXT ) ) );
+    aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTION ) ) );
+    aStyleSettings.SetDeactiveTextColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVECAPTIONTEXT ) ) );
+    if ( aSalShlData.mbWXP )
+    {
+        // only xp supports a different menu bar color
+        long bFlatMenues = 0;
+        SystemParametersInfo( SPI_GETFLATMENU, 0, &bFlatMenues, 0);
+        if( bFlatMenues )
         {
-            // only xp supports a different menu bar color
-            long bFlatMenues = 0;
-            SystemParametersInfo( SPI_GETFLATMENU, 0, &bFlatMenues, 0);
-            if( bFlatMenues )
-            {
-                aStyleSettings.SetUseFlatMenues( TRUE );
-                aStyleSettings.SetMenuBarColor( ImplWinColorToSal( GetSysColor( COLOR_MENUBAR ) ) );
-                aStyleSettings.SetMenuHighlightColor( ImplWinColorToSal( GetSysColor( COLOR_MENUHILIGHT ) ) );
-                aStyleSettings.SetMenuBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) );
-
-                // flat borders for our controls etc. as well in this mode (ie, no 3d borders)
-                // this is not active in the classic style appearance
-                aStyleSettings.SetUseFlatBorders( TRUE );
-            }
+            aStyleSettings.SetUseFlatMenues( TRUE );
+            aStyleSettings.SetMenuBarColor( ImplWinColorToSal( GetSysColor( COLOR_MENUBAR ) ) );
+            aStyleSettings.SetMenuHighlightColor( ImplWinColorToSal( GetSysColor( COLOR_MENUHILIGHT ) ) );
+            aStyleSettings.SetMenuBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) );
+            
+            // flat borders for our controls etc. as well in this mode (ie, no 3d borders)
+            // this is not active in the classic style appearance
+            aStyleSettings.SetUseFlatBorders( TRUE );
         }
-        // check if vista or newer runs
-        // in Aero theme (and similar ?) the menu text color does not change
-        // for selected items; also on WinXP and earlier menus are not themed
-        if( aSalShlData.maVersionInfo.dwMajorVersion >= 6 &&
-            ImplDwmIsCompositionEnabled()
-            )
-        {
-            // in aero menuitem highlight text is drawn in the same color as normal
-            aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() );
-            pSVData->maNWFData.mnMenuFormatExtraBorder = 2;
-            pSVData->maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor();
-            GetSalData()->mbThemeMenuSupport = TRUE;
-        }
+    }
+    // check if vista or newer runs
+    // in Aero theme (and similar ?) the menu text color does not change
+    // for selected items; also on WinXP and earlier menus are not themed
+    if( aSalShlData.maVersionInfo.dwMajorVersion >= 6 &&
+       ImplDwmIsCompositionEnabled()
+       )
+    {
+        // in aero menuitem highlight text is drawn in the same color as normal
+        aStyleSettings.SetMenuHighlightTextColor( aStyleSettings.GetMenuTextColor() );
+        pSVData->maNWFData.mnMenuFormatExtraBorder = 2;
+        pSVData->maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor();
+        GetSalData()->mbThemeMenuSupport = TRUE;
     }
     // Bei hellgrau geben wir die Farbe vor, damit es besser aussieht
     if ( aStyleSettings.GetFaceColor() == COL_LIGHTGRAY )