haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the dock art provider to a pointer instance

This commit is contained in:
Marek Roszko 2020-10-18 11:31:44 -04:00
parent 496532b6ea
commit a5c9151800
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/eda_base_frame.cpp
View File

@ -47,6 +47,7 @@
#include <trace_helpers.h> #include <trace_helpers.h>
#include <widgets/paged_dialog.h> #include <widgets/paged_dialog.h>
#include <widgets/infobar.h> #include <widgets/infobar.h>
#include <widgets/wx_aui_dock_art.h>
#include <wx/display.h> #include <wx/display.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
#include <wx/string.h> #include <wx/string.h>
@ -96,7 +97,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
m_mruPath = wxStandardPaths::Get().GetDocumentsDir(); m_mruPath = wxStandardPaths::Get().GetDocumentsDir();
m_FrameSize = wxSize( s_minsize_x, s_minsize_y ); m_FrameSize = wxSize( s_minsize_x, s_minsize_y );
m_auimgr.SetArtProvider( &m_auiDockArt ); m_auimgr.SetArtProvider( new WX_AUI_DOCK_ART() );
m_settingsManager = &Pgm().GetSettingsManager(); m_settingsManager = &Pgm().GetSettingsManager();

2
include/eda_base_frame.h
View File

@ -47,7 +47,6 @@
#include <kiway_holder.h> #include <kiway_holder.h>
#include <tool/tools_holder.h> #include <tool/tools_holder.h>
#include <widgets/ui_common.h> #include <widgets/ui_common.h>
#include <widgets/wx_aui_dock_art.h>
#include <undo_redo_container.h> #include <undo_redo_container.h>
// Option for main frames // Option for main frames
@ -136,7 +135,6 @@ protected:
wxString m_AboutTitle; // Name of program displayed in About. wxString m_AboutTitle; // Name of program displayed in About.
WX_AUI_DOCK_ART m_auiDockArt; // Our custom dock art provider we feed to the aui manager
wxAuiManager m_auimgr; wxAuiManager m_auimgr;
wxString m_perspective; // wxAuiManager perspective. wxString m_perspective; // wxAuiManager perspective.