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

Closes bug report 592566. 

* Field match method expected SCH_SHEET_PATH pointer type not SCH_SHEET
  pointer type.
This commit is contained in:
Wayne Stambaugh 2010-06-11 14:34:20 -04:00
parent f3b5ed438c
commit 534bb97dc5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/class_drawsheetpath.cpp
View File

@ -335,7 +335,7 @@ SCH_ITEM* SCH_SHEET_PATH::MatchNextItem( wxFindReplaceData& aSearchData,
}
else
{
if( drawItem->Matches( aSearchData, Last() ) )
if( drawItem->Matches( aSearchData, this ) )
return drawItem;
}

4
eeschema/find.cpp
View File

@ -290,7 +290,7 @@ SCH_ITEM* WinEDA_SchematicFrame::FindComponentAndItem( const wxString& component
*/
void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event )
{
static SCH_ITEM* lastItem = NULL;
static SCH_ITEM* lastItem = NULL;
SCH_SHEET_LIST schematic;
wxString msg;
@ -301,7 +301,7 @@ void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event )
searchCriteria.SetFindString( event.GetFindString() );
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;
lastItem = m_CurrentSheet->MatchNextItem( searchCriteria, lastItem );