Push tool framework base down into TOOL_HOLDER.
This allows us to use it outside of EDA_BASE_FRAMEs (in this case, in PANEL_PREVIEW_3D.)
This commit is contained in:
@@ -151,13 +151,8 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
|
||||
{
|
||||
SetKiway( this, aKiway );
|
||||
|
||||
wxString unitList[] =
|
||||
{
|
||||
_("mm"), _("Inch"), _("DPI")
|
||||
};
|
||||
|
||||
for( int ii = 0; ii < 3; ii++ )
|
||||
m_PixelUnit->Append( unitList[ii] );
|
||||
for( wxString unit : { _( "mm" ), _( "Inch" ), _( "DPI" ) } )
|
||||
m_PixelUnit->Append( unit );
|
||||
|
||||
LoadSettings( config() );
|
||||
|
||||
@@ -202,6 +197,12 @@ BM2CMP_FRAME::~BM2CMP_FRAME()
|
||||
}
|
||||
|
||||
|
||||
wxWindow* BM2CMP_FRAME::GetToolCanvas() const
|
||||
{
|
||||
return m_Notebook->GetCurrentPage();
|
||||
}
|
||||
|
||||
|
||||
void BM2CMP_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
|
||||
{
|
||||
EDA_BASE_FRAME::LoadSettings( aCfg );
|
||||
|
||||
Reference in New Issue
Block a user