diff options
| -rw-r--r-- | dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2 | ||||
| -rw-r--r-- | include/svtools/ivctrl.hxx | 2 | ||||
| -rw-r--r-- | include/tools/wintypes.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index d0557ddc033b..bc4fef3b9125 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -49,7 +49,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) , m_eChildFocus(NONE) { // Header - m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER | WB_INFO ); + m_pHeader = VclPtr<FixedText>::Create( this, WB_CENTER ); m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) ); m_pHeader->Show(); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 0b22ae3e3182..1364c6c23eaf 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -185,7 +185,7 @@ public: #define WB_ALIGN_TOP WB_TOP #define WB_ALIGN_LEFT WB_LEFT #define WB_NOCOLUMNHEADER WB_CENTER -#define WB_HIGHLIGHTFRAME WB_INFO +#define WB_HIGHLIGHTFRAME WB_IGNORETAB #define WB_NOASYNCSELECTHDL WB_NOLABEL class MnemonicGenerator; diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx index cb0fd7108bd3..0d8e9b7c873c 100644 --- a/include/tools/wintypes.hxx +++ b/include/tools/wintypes.hxx @@ -198,7 +198,6 @@ WinBits const WB_FLATBUTTON = SAL_CONST_INT64(0x4000000000); WinBits const WB_PATHELLIPSIS = 0x00100000; WinBits const WB_EXTRAOFFSET = 0x02000000; WinBits const WB_NOMULTILINE = 0x10000000; -WinBits const WB_INFO = 0x20000000; // Window-Bits for CheckBox WinBits const WB_CBLINESTYLE = SAL_CONST_INT64(0x2000000000); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 0164ce85cab8..ce01670c879a 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -37,7 +37,7 @@ WB_LEFT | WB_CENTER | WB_RIGHT | \ WB_TOP | WB_VCENTER | WB_BOTTOM | \ WB_WORDBREAK | WB_NOLABEL | \ - WB_INFO | WB_PATHELLIPSIS) + WB_PATHELLIPSIS) #define FIXEDLINE_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL) #define FIXEDBITMAP_VIEW_STYLE (WB_3DLOOK | \ WB_LEFT | WB_CENTER | WB_RIGHT | \ @@ -96,12 +96,12 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle ) const vcl::Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const { - return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont(); + return _rStyle.GetLabelFont(); } const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const { - return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor(); + return _rStyle.GetLabelTextColor(); } FixedText::FixedText( vcl::Window* pParent, WinBits nStyle ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 9b60717c6228..5884a7316c40 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -96,7 +96,7 @@ static bool ImplIsMnemonicCtrl( vcl::Window* pWindow ) return true; //This is the legacy pre-layout logic which we retain //until we can be sure we can remove it - if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) ) + if (pWindow->GetStyle() & WB_NOLABEL) return false; vcl::Window* pNextWindow = pWindow->GetWindow( GetWindowType::Next ); if ( !pNextWindow ) |