From 96743140283fc90ba56735201e587862da2ab67e Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Mon, 24 Jul 2006 16:00:37 +0000 Subject: [PATCH] floating panes now respect wxPaneInfo::HasCloseButton() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/floatpane.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index c70ef3e168..b365752ee1 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -41,7 +41,8 @@ wxFloatingPane::wxFloatingPane(wxWindow* parent, : wxFloatingPaneBaseClass(parent, id, wxEmptyString, pane.floating_pos, pane.floating_size, wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxCLOSE_BOX | wxFRAME_NO_TASKBAR | + (pane.HasCloseButton()?wxCLOSE_BOX:0) | + wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN | (pane.IsFixed()?0:wxRESIZE_BORDER) ) -- 2.45.2