github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

TheIDE: Fixed FindInFiles name clash (->FindInFilesDlg)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2041 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-02-09 18:03:33 +00:00
parent f5f3ddcd4d
commit c0dea5dff1
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/ide/FindInFiles.cpp
View file

@ -387,17 +387,17 @@ void Ide::ConstructFindInFiles() {
CtrlLayoutOKCancel(ff, "Find In Files");
}
void FindInFiles::Sync()
void FindInFilesDlg::Sync()
{
replace.Enable((int)~style);
}
FindInFiles::FindInFiles()
FindInFilesDlg::FindInFilesDlg()
{
style <<= THISBACK(Sync);
}
void FindInFiles::Setup(bool replacing)
void FindInFilesDlg::Setup(bool replacing)
{
Title(replacing ? "Find and replace in files" : "Find in files");
replace_lbl.Show(replacing);
@ -412,7 +412,7 @@ void FindInFiles::Setup(bool replacing)
SetRect(r);
}
bool FindInFiles::Key(dword key, int count)
bool FindInFilesDlg::Key(dword key, int count)
{
if(key == K_CTRL_I) {
if(find.HasFocus()) {

10
uppsrc/ide/ide.h
View file

@ -406,7 +406,7 @@ void DirSel(EditField& f, FrameRight<Button>& b);
bool CopyFolder(const char *dst, const char *src, Progress *pi);
void SvnSyncDirs(const Vector<String>& working);
struct FindInFiles : WithFindInFilesLayout<TopWindow> {
struct FindInFilesDlg : WithFindInFilesLayout<TopWindow> {
WString itext;
virtual bool Key(dword key, int count);
@ -414,9 +414,9 @@ struct FindInFiles : WithFindInFilesLayout<TopWindow> {
void Setup(bool replace);
void Sync();
typedef FindInFiles CLASSNAME;
typedef FindInFilesDlg CLASSNAME;
FindInFiles();
FindInFilesDlg();
};
struct Ide : public TopWindow, public WorkspaceWork, public IdeContext, public MakeBuild {
@ -685,8 +685,8 @@ public:
enum { STYLE_NO_REPLACE, STYLE_CONFIRM_REPLACE, STYLE_AUTO_REPLACE };
FindInFiles ff;
int iwc;
FindInFilesDlg ff;
int iwc;
int doc_serial;
TopicCtrl doc;