summaryrefslogtreecommitdiff
path: root/ui/search.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:10:11 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:10:11 +0200
commitc0cdb2ad99a1e2a6ade5ce76c91177a79258e669 (patch)
tree4701a015385d9a6a5a4ba99a8f1f5d400fff26b1 /ui/search.cpp
parent3.13 (diff)
downloadFreeFileSync-c0cdb2ad99a1e2a6ade5ce76c91177a79258e669.tar.gz
FreeFileSync-c0cdb2ad99a1e2a6ade5ce76c91177a79258e669.tar.bz2
FreeFileSync-c0cdb2ad99a1e2a6ade5ce76c91177a79258e669.zip
3.14
Diffstat (limited to 'ui/search.cpp')
-rw-r--r--ui/search.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/search.cpp b/ui/search.cpp
index d27e3009..e6fa4255 100644
--- a/ui/search.cpp
+++ b/ui/search.cpp
@@ -9,7 +9,7 @@
#include <wx/msgdlg.h>
#include <wx/utils.h>
#include <utility>
-#include "mouse_move_dlg.h"
+#include "../shared/mouse_move_dlg.h"
class SearchDlg : public SearchDialogGenerated
@@ -143,10 +143,10 @@ std::pair<int, int> searchGrid(const wxGrid& grid,
int cursorRow = const_cast<wxGrid&>(grid).GetGridCursorRow();
int cursorColumn = const_cast<wxGrid&>(grid).GetGridCursorCol();
- if ( cursorRow < 0 ||
- cursorRow >= rowCount ||
- cursorColumn < 0 ||
- cursorColumn >= columnCount)
+ if (cursorRow < 0 ||
+ cursorRow >= rowCount ||
+ cursorColumn < 0 ||
+ cursorColumn >= columnCount)
{
//cursor not on valid position...
cursorRow = 0;
@@ -210,8 +210,8 @@ void executeSearch(bool forceShowDialog,
if (forceShowDialog || lastSearchString.IsEmpty())
{
- SearchDlg* searchDlg = new SearchDlg(parentWindow, lastSearchString, respectCase); //wxWidgets deletion handling -> deleted by parentWindow
- if (static_cast<SearchDlg::ReturnCodes>(searchDlg->ShowModal()) != SearchDlg::BUTTON_OKAY)
+ SearchDlg searchDlg(parentWindow, lastSearchString, respectCase); //wxWidgets deletion handling -> deleted by parentWindow
+ if (static_cast<SearchDlg::ReturnCodes>(searchDlg.ShowModal()) != SearchDlg::BUTTON_OKAY)
return;
searchDialogWasShown = true;
bgstack15