From f376790583b59649baee6342030baaea287bd472 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Tue, 5 May 2015 19:45:08 -0400 Subject: [PATCH] Remove environment-specific line for OS X --- Makefile | 1 - src/widgets/MainFrame.cpp | 20 ++++---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 65ade8e..0825969 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ endif # Platform compiler flags ifeq ($(OS),Darwin) 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 endif ifeq ($(OS),Linux) diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp index 7542e79..f66c87b 100644 --- a/src/widgets/MainFrame.cpp +++ b/src/widgets/MainFrame.cpp @@ -475,12 +475,7 @@ void MainFrame::OnEditFind(wxCommandEvent &WXUNUSED(event)) } else { - findDlg = new wxFindReplaceDialog( - this, - findReplaceData, - "Find" - ); - + findDlg = new wxFindReplaceDialog(this, findReplaceData, "Find"); findDlg->Show(true); } } @@ -498,12 +493,8 @@ void MainFrame::OnEditReplace(wxCommandEvent &WXUNUSED(event)) } else { - replaceDlg = new wxFindReplaceDialog( - this, - findReplaceData, - "Find and Replace", - wxFR_REPLACEDIALOG - ); + replaceDlg = new wxFindReplaceDialog(this, findReplaceData, + "Find and Replace", wxFR_REPLACEDIALOG); replaceDlg->Show(true); } @@ -569,10 +560,7 @@ void MainFrame::OnFindDialog(wxFindDialogEvent &event) } if (new_pos >= 0) - { - /*editor->SetSelectionStart(editor->GetAnchor()); - editor->SetSelectionEnd(new_pos);*/ - + { new_line = editor->LineFromPosition(new_pos); editor->ScrollToLine(new_line); }