Browse Source

Attempt to fix mocks build issue.

7.0
Jeff Young 4 years ago
parent
commit
08cdbdac7e
  1. 2
      qa/pns/pns_log_viewer.cpp
  2. 4
      qa/qa_utils/mocks.cpp

2
qa/pns/pns_log_viewer.cpp

@ -291,7 +291,7 @@ PNS_LOG_VIEWER_FRAME::PNS_LOG_VIEWER_FRAME( wxFrame* frame ) : PNS_LOG_VIEWER_FR
auto settings = static_cast<KIGFX::PCB_RENDER_SETTINGS*>(
m_galPanel->GetView()->GetPainter()->GetSettings() );
settings->SetZoneDisplayMode( ZONE_DISPLAY_MODE::SHOW_FILLED );
settings.m_ZoneDisplayMode = ZONE_DISPLAY_MODE::SHOW_FILLED;
m_listPopupMenu = new wxMenu( wxT( "" ) );
m_listPopupMenu->Append( ID_LIST_COPY, wxT( "Copy selected geometry" ), wxT( "" ),

4
qa/qa_utils/mocks.cpp

@ -619,9 +619,9 @@ bool PCB_TOOL_BASE::Is45Limited() const
}
const PCB_DISPLAY_OPTIONS& PCB_TOOL_BASE::displayOptions() const
PCBNEW_SETTINGS::DISPLAY_OPTIONS& PCB_TOOL_BASE::displayOptions() const
{
static PCB_DISPLAY_OPTIONS disp;
static PCBNEW_SETTINGS::DISPLAY_OPTIONS disp;
return disp;
}

Loading…
Cancel
Save