diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 914f8f4ee9d9..d1be1f15427f 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -96,8 +96,6 @@ typedef sal_uInt16 WindowBorderStyle; #define WINDOW_BORDER_NORMAL ((WindowBorderStyle)0x0001) #define WINDOW_BORDER_MONO ((WindowBorderStyle)0x0002) -#define WINDOW_BORDER_ACTIVE ((WindowBorderStyle)0x0004) -#define WINDOW_BORDER_DOUBLEOUT ((WindowBorderStyle)0x0008) #define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010) #define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000) diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 5a69920a841e..bb1fa3b7e367 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -314,8 +314,6 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, // Konstanten in Tabelle stellen SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WINDOW_BORDER_NORMAL ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WINDOW_BORDER_MONO ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_ACTIVE" ), WINDOW_BORDER_ACTIVE ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_DOUBLEOUT" ), WINDOW_BORDER_DOUBLEOUT ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WINDOW_BORDER_MENU ); SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WINDOW_BORDER_NOBORDER ); diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 0d64a3c55d28..aaf7f3a095c7 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -289,8 +289,6 @@ typedef sal_uInt16 StateChangedType; // Border-Styles fuer SetBorder() #define WINDOW_BORDER_NORMAL ((sal_uInt16)0x0001) #define WINDOW_BORDER_MONO ((sal_uInt16)0x0002) -#define WINDOW_BORDER_ACTIVE ((sal_uInt16)0x0004) -#define WINDOW_BORDER_DOUBLEOUT ((sal_uInt16)0x0008) #define WINDOW_BORDER_MENU ((sal_uInt16)0x0010) #define WINDOW_BORDER_TOPBOTTOM ((sal_uInt16)0x0020) #define WINDOW_BORDER_NWF ((sal_uInt16)0x0040) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 5d9ac3e61a98..94a21e9a8a72 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1198,7 +1198,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei sal_uInt16 nStyle = FRAME_DRAW_NODRAW; // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster // ist, dann Border nach aussen - if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) + if ( mpBorderWindow->mbSmallOutBorder ) nStyle |= FRAME_DRAW_DOUBLEOUT; else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) nStyle |= FRAME_DRAW_TOPBOTTOM; @@ -1377,42 +1377,29 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME ) { - if ( nBorderStyle & WINDOW_BORDER_ACTIVE ) - { - Color aColor = mpOutDev->GetSettings().GetStyleSettings().GetHighlightColor(); - mpOutDev->SetLineColor(); - mpOutDev->SetFillColor( aColor ); - mpOutDev->DrawRect( Rectangle( 0, 0, mnWidth-1, mnTopBorder ) ); - mpOutDev->DrawRect( Rectangle( 0, mnHeight-mnBottomBorder, mnWidth-1, mnHeight-1 ) ); - mpOutDev->DrawRect( Rectangle( 0, 0, mnLeftBorder, mnHeight-1 ) ); - mpOutDev->DrawRect( Rectangle( mnWidth-mnRightBorder, 0, mnWidth-1, mnHeight-1 ) ); - } + sal_uInt16 nStyle = 0; + // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster + // ist, dann Border nach aussen + if ( mpBorderWindow->mbSmallOutBorder ) + nStyle |= FRAME_DRAW_DOUBLEOUT; + else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) + nStyle |= FRAME_DRAW_TOPBOTTOM; + else if ( nBorderStyle & WINDOW_BORDER_NWF ) + nStyle |= FRAME_DRAW_NWF; else - { - sal_uInt16 nStyle = 0; - // Wenn Border umgesetzt wurde oder BorderWindow ein Frame-Fenster - // ist, dann Border nach aussen - if ( (nBorderStyle & WINDOW_BORDER_DOUBLEOUT) || mpBorderWindow->mbSmallOutBorder ) - nStyle |= FRAME_DRAW_DOUBLEOUT; - else if ( nBorderStyle & WINDOW_BORDER_TOPBOTTOM ) - nStyle |= FRAME_DRAW_TOPBOTTOM; - else if ( nBorderStyle & WINDOW_BORDER_NWF ) - nStyle |= FRAME_DRAW_NWF; - else - nStyle |= FRAME_DRAW_DOUBLEIN; - if ( nBorderStyle & WINDOW_BORDER_MONO ) - nStyle |= FRAME_DRAW_MONO; - if ( nBorderStyle & WINDOW_BORDER_MENU ) - nStyle |= FRAME_DRAW_MENU; - // tell DrawFrame that we're drawing a window border of a frame window to avoid round corners - if( pWin && pWin == pWin->ImplGetFrameWindow() ) - nStyle |= FRAME_DRAW_WINDOWBORDER; + nStyle |= FRAME_DRAW_DOUBLEIN; + if ( nBorderStyle & WINDOW_BORDER_MONO ) + nStyle |= FRAME_DRAW_MONO; + if ( nBorderStyle & WINDOW_BORDER_MENU ) + nStyle |= FRAME_DRAW_MENU; + // tell DrawFrame that we're drawing a window border of a frame window to avoid round corners + if( pWin && pWin == pWin->ImplGetFrameWindow() ) + nStyle |= FRAME_DRAW_WINDOWBORDER; - DecorationView aDecoView( mpOutDev ); - Point aTmpPoint; - Rectangle aInRect( aTmpPoint, Size( mnWidth, mnHeight ) ); - aDecoView.DrawFrame( aInRect, nStyle ); - } + DecorationView aDecoView( mpOutDev ); + Point aTmpPoint; + Rectangle aInRect( aTmpPoint, Size( mnWidth, mnHeight ) ); + aDecoView.DrawFrame( aInRect, nStyle ); } }