Commit 534bb97d authored by Wayne Stambaugh's avatar Wayne Stambaugh

Closes bug report 592566.

* Field match method expected SCH_SHEET_PATH pointer type not SCH_SHEET
  pointer type.
parent f3b5ed43
...@@ -335,7 +335,7 @@ SCH_ITEM* SCH_SHEET_PATH::MatchNextItem( wxFindReplaceData& aSearchData, ...@@ -335,7 +335,7 @@ SCH_ITEM* SCH_SHEET_PATH::MatchNextItem( wxFindReplaceData& aSearchData,
} }
else else
{ {
if( drawItem->Matches( aSearchData, Last() ) ) if( drawItem->Matches( aSearchData, this ) )
return drawItem; return drawItem;
} }
......
...@@ -290,7 +290,7 @@ SCH_ITEM* WinEDA_SchematicFrame::FindComponentAndItem( const wxString& component ...@@ -290,7 +290,7 @@ SCH_ITEM* WinEDA_SchematicFrame::FindComponentAndItem( const wxString& component
*/ */
void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event ) void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event )
{ {
static SCH_ITEM* lastItem = NULL; static SCH_ITEM* lastItem = NULL;
SCH_SHEET_LIST schematic; SCH_SHEET_LIST schematic;
wxString msg; wxString msg;
...@@ -301,7 +301,7 @@ void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event ) ...@@ -301,7 +301,7 @@ void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event )
searchCriteria.SetFindString( event.GetFindString() ); searchCriteria.SetFindString( event.GetFindString() );
searchCriteria.SetReplaceString( event.GetReplaceString() ); searchCriteria.SetReplaceString( event.GetReplaceString() );
if( event.GetFlags() & FR_CURRENT_SHEET_ONLY ) if( event.GetFlags() & FR_CURRENT_SHEET_ONLY && g_RootSheet->CountSheets() > 1 )
{ {
sheetFoundIn = m_CurrentSheet; sheetFoundIn = m_CurrentSheet;
lastItem = m_CurrentSheet->MatchNextItem( searchCriteria, lastItem ); lastItem = m_CurrentSheet->MatchNextItem( searchCriteria, lastItem );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment