floating panes now respect wxPaneInfo::HasCloseButton()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index c70ef3e168a7a2cbe675921a0f2cd3a0584abbaf..b365752ee184e09d9d248844ae617fbc9ef9c1e4 100644 (file)
--- 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 |
                 : 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)
                         )
                         wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN |
                         (pane.IsFixed()?0:wxRESIZE_BORDER)
                         )