Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxAUI: Made fixed size floating panes work

Browse Source 
wxAUI: Added IMPLEMENT_CLASS etc. for wxFloatingPane for a later patch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Alex Bligh
2006-07-04 15:26:33 +00:00
parent ed3d6ace49
commit e5ab82d310
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/aui/floatpane.cpp
View File

@@ -32,15 +32,19 @@
#ifndef WX_PRECOMP
#endif
IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
wxFloatingPane::wxFloatingPane(wxWindow* parent,
wxFrameManager* owner_mgr,
wxWindowID id /*= wxID_ANY*/,
const wxPoint& pos /*= wxDefaultPosition*/,
const wxSize& size /*= wxDefaultSize*/)
: wxFloatingPaneBaseClass(parent, id, wxEmptyString, pos, size,
const wxPaneInfo& pane,
wxWindowID id /*= wxID_ANY*/)
: wxFloatingPaneBaseClass(parent, id, wxEmptyString,
pane.floating_pos, pane.floating_size,
wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
wxCLOSE_BOX | wxFRAME_NO_TASKBAR |
wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN)
wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN |
(pane.IsFixed()?0:wxRESIZE_BORDER)
)
{
m_owner_mgr = owner_mgr;
m_moving = false;
@@ -80,9 +84,6 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
SetTitle(pane.caption);
if (contained_pane.IsFixed())
SetWindowStyle(GetWindowStyle() & ~wxRESIZE_BORDER);
if (pane.floating_size != wxDefaultSize)
{
SetSize(pane.floating_size);