diff options
| -rw-r--r-- | vcl/source/window/window.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 49551be5f901..9a5a6cde533b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2239,7 +2239,8 @@ void Window::Show(bool bVisible, ShowFlags nFlags) // inherit native widget flag for form controls // required here, because frames never show up in the child hierarchy - which should be fixed... // eg, the drop down of a combobox which is a system floating window - if( mpWindowImpl->mbFrame && GetParent() && GetParent()->IsCompoundControl() && + if( mpWindowImpl->mbFrame && GetParent() && !GetParent()->IsDisposed() && + GetParent()->IsCompoundControl() && GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() && !(GetStyle() & WB_TOOLTIPWIN) ) { @@ -3706,7 +3707,7 @@ void Window::EnableNativeWidget( bool bEnable ) bool Window::IsNativeWidgetEnabled() const { - return ImplGetWinData()->mbEnableNativeWidget; + return mpWindowImpl ? ImplGetWinData()->mbEnableNativeWidget : false; } Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas ) const diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 0e4b3d6ee00f..e2c306fdab1b 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1182,7 +1182,7 @@ GetFocusFlags Window::GetGetFocusFlags() const bool Window::IsCompoundControl() const { - return mpWindowImpl->mbCompoundControl; + return mpWindowImpl ? mpWindowImpl->mbCompoundControl : false; } bool Window::IsWait() const |