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

Reverted wxAuiFloatingFrame dtor crash fix (r51324) in favor of wxWeakRef implementation, thanks Robert.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-01-23 07:53:03 +00:00
parent 3056dddc54
commit 704e631016
4 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/aui/framemanager.h
View File

@@ -121,7 +121,6 @@ enum wxAuiPaneInsertLevel
// forwards and array declarations
class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;
class wxAuiDockUIPart;
class wxAuiPaneButton;
class wxAuiPaneInfo;
@@ -134,7 +133,6 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockInfo, wxAuiDockInfoArray, WXDLLIMPEXP
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockUIPart, wxAuiDockUIPartArray, WXDLLIMPEXP_AUI);
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneButton, wxAuiPaneButtonArray, WXDLLIMPEXP_AUI);
WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneInfo, wxAuiPaneInfoArray, WXDLLIMPEXP_AUI);
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiFloatingFrame*, wxAuiFloatingFramePtrArray, class WXDLLIMPEXP_AUI);
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiPaneInfo*, wxAuiPaneInfoPtrArray, class WXDLLIMPEXP_AUI);
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiDockInfo*, wxAuiDockInfoPtrArray, class WXDLLIMPEXP_AUI);
#endif // SWIG
@@ -421,6 +419,8 @@ public:
class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;
class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
{
friend class wxAuiFloatingFrame;
@@ -511,12 +511,6 @@ public:
protected:
// Sometimes floating frames are deleted after wxAuiManager, so we need
// to clear m_owner_mgr in the floating frame to avoid a crash. To do so,
// we register frames with wxAuiManager so it can keep track.
void RegisterFloatingFrame(wxAuiFloatingFrame* frame);
void UnregisterFloatingFrame(wxAuiFloatingFrame* frame);
void UpdateHintWindowConfig();
void DoFrameLayout();
@@ -607,7 +601,6 @@ protected:
wxAuiPaneInfoArray m_panes; // array of panes structures
wxAuiDockInfoArray m_docks; // array of docks structures
wxAuiDockUIPartArray m_uiparts; // array of UI parts (captions, buttons, etc)
wxAuiFloatingFramePtrArray m_floating_frames; // array of floating frames
int m_action; // current mouse action
wxPoint m_action_start; // position where the action click started