diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-07 10:16:34 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-07 10:16:34 +0000 |
| commit | 782ba886a2c93f86acdfa681a52b5315f1380a6e (patch) | |
| tree | 91a90b57dd009aa1ebbdf5bdea0f0d589c759e8d /vcl/source/control | |
| parent | e1ad946ef5db3f7c0a540207d0f0fd85799e3b66 (diff) | |
CWS-TOOLING: integrate CWS kde4int
2009-07-15 10:40:52 +0200 pl r273993 : #i103288# configure
2009-07-09 14:57:24 +0200 pl r273867 : #i103284# spin fields
2009-07-09 13:49:13 +0200 pl r273864 : #i103284# min size for dropdown comboboxes
2009-07-09 13:46:11 +0200 pl r273860 : #i103284# min size fro dropdown listboxes
2009-07-09 13:01:48 +0200 pl r273857 : #i103284# fix most radiobuttons and checboxes, also on tabpages
2009-07-08 19:38:12 +0200 pl r273847 : #i103290# clean up, enable KDE4 fpicker
2009-07-08 15:54:06 +0200 pl r273837 : #i103284# background mode opaque doesn't look that good
2009-07-07 19:29:01 +0200 pl r273814 : add kde4 directory and deliverables
2009-07-07 11:18:08 +0200 pl r273786 : make compile with Qt 4.1
2009-07-02 19:20:47 +0200 pl r273673 : #i103290# add: KDE4 file picker (thanks Roman Shtylman)
2009-07-02 19:16:07 +0200 pl r273672 : #i103289# add: KDE4integration (thanks Roman Shtylman)
2009-07-02 19:01:20 +0200 pl r273671 : #i103286# add: KDE4 checks (thanks Roman Shtylman)
2009-07-02 18:58:15 +0200 pl r273670 : #i103286# initial import for KDE4 backend (thanks Roman Shtylman)
2009-07-02 18:08:06 +0200 pl r273668 : #i103284# initial import for KDE4 plugin (thanks Roman Shtylman)
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 28 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 4 |
2 files changed, 13 insertions, 19 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 309acb404750..49c7e5457da7 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -142,23 +142,19 @@ void ComboBox::ImplCalcEditHeight() if ( !IsDropDownBox() ) mnDDHeight += 4; - // FIXME: currently only on aqua; see if we can use this on other platforms - if( ImplGetSVData()->maNWFData.mbNoFocusRects ) + Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( 10, 10 ) ) ); + Region aBoundRegion, aContentRegion; + ImplControlValue aControlValue; + ControlType aType = IsDropDownBox() ? CTRL_COMBOBOX : CTRL_EDITBOX; + if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL, + aCtrlRegion, + CTRL_STATE_ENABLED, + aControlValue, rtl::OUString(), + aBoundRegion, aContentRegion ) ) { - Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( 10, 10 ) ) ); - Region aBoundRegion, aContentRegion; - ImplControlValue aControlValue; - ControlType aType = IsDropDownBox() ? CTRL_COMBOBOX : CTRL_EDITBOX; - if( GetNativeControlRegion( aType, PART_ENTIRE_CONTROL, - aCtrlRegion, - CTRL_STATE_ENABLED, - aControlValue, rtl::OUString(), - aBoundRegion, aContentRegion ) ) - { - const long nNCHeight = aBoundRegion.GetBoundRect().GetHeight(); - if( mnDDHeight < nNCHeight ) - mnDDHeight = sal::static_int_cast<USHORT>( nNCHeight ); - } + const long nNCHeight = aBoundRegion.GetBoundRect().GetHeight(); + if( mnDDHeight < nNCHeight ) + mnDDHeight = sal::static_int_cast<USHORT>( nNCHeight ); } } diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 641665aacf6b..a5e9ff1cc7d0 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -127,9 +127,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) GetBorder( nLeft, nTop, nRight, nBottom ); mnDDHeight = (USHORT)(GetTextHeight() + nTop + nBottom + 4); - // FIXME: this is currently only on mac/aqua - if( ImplGetSVData()->maNWFData.mbNoFocusRects && - IsNativeWidgetEnabled() && + if( IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { ImplControlValue aControlValue; |