Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-03 15:20:17 +01:00
Code Issues Releases Wiki Activity

ToolDock does not depend directly on ToolManager

Browse Source
This commit is contained in:
Paul Licameli
2019-06-12 17:44:22 -04:00
parent ab4751d092
commit 4bbf8bfb6a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/toolbars/ToolDock.cpp
View File

@@ -40,8 +40,6 @@
#include <wx/window.h>
#endif /* */
#include "ToolManager.h"
#include <algorithm>
#include "../AColor.h"
@@ -378,7 +376,7 @@ END_EVENT_TABLE()
//
// Constructor
//
ToolDock::ToolDock( ToolManager *manager, wxWindow *parent, int dockid ):
ToolDock::ToolDock( wxEvtHandler *manager, wxWindow *parent, int dockid ):
wxPanelWrapper( parent, dockid, wxDefaultPosition, parent->GetSize() )
{
SetLabel( XO( "ToolDock" ) );

5
src/toolbars/ToolDock.h
View File

@@ -27,7 +27,6 @@ class wxRect;
class wxWindow;
class GrabberEvent;
class ToolManager;
////////////////////////////////////////////////////////////
/// class ToolDock
@@ -290,7 +289,7 @@ class ToolDock final : public wxPanelWrapper
{
public:
ToolDock( ToolManager *manager, wxWindow *parent, int dockid );
ToolDock( wxEvtHandler *manager, wxWindow *parent, int dockid );
~ToolDock();
bool AcceptsFocus() const override { return false; };
@@ -332,7 +331,7 @@ public:
ToolManager *mManager;
wxEvtHandler *mManager;
// Stores adjacency relations that we want to realize in the dock layout
ToolBarConfiguration mConfiguration;