timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove environment-specific line for OS X

This commit is contained in:
Tim Warren 2015-05-05 19:45:08 -04:00
parent 042be6734c
commit f376790583
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -31,7 +31,6 @@ endif
# Platform compiler flags # Platform compiler flags
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
CXX = $(shell wx-config --cxx) CXX = $(shell wx-config --cxx)
CXX += -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk
LDLIBS += /usr/local/lib/libssh2.a LDLIBS += /usr/local/lib/libssh2.a
endif endif
ifeq ($(OS),Linux) ifeq ($(OS),Linux)

20
src/widgets/MainFrame.cpp
View File

@ -475,12 +475,7 @@ void MainFrame::OnEditFind(wxCommandEvent &WXUNUSED(event))
} }
else else
{ {
findDlg = new wxFindReplaceDialog( findDlg = new wxFindReplaceDialog(this, findReplaceData, "Find");
this,
findReplaceData,
"Find"
);
findDlg->Show(true); findDlg->Show(true);
} }
} }
@ -498,12 +493,8 @@ void MainFrame::OnEditReplace(wxCommandEvent &WXUNUSED(event))
} }
else else
{ {
replaceDlg = new wxFindReplaceDialog( replaceDlg = new wxFindReplaceDialog(this, findReplaceData,
this, "Find and Replace", wxFR_REPLACEDIALOG);
findReplaceData,
"Find and Replace",
wxFR_REPLACEDIALOG
);
replaceDlg->Show(true); replaceDlg->Show(true);
} }
@ -569,10 +560,7 @@ void MainFrame::OnFindDialog(wxFindDialogEvent &event)
} }
if (new_pos >= 0) if (new_pos >= 0)
{ {
/*editor->SetSelectionStart(editor->GetAnchor());
editor->SetSelectionEnd(new_pos);*/
new_line = editor->LineFromPosition(new_pos); new_line = editor->LineFromPosition(new_pos);
editor->ScrollToLine(new_line); editor->ScrollToLine(new_line);
} }