From 7f8209a4d94dff3de562d1284fbad0a35165e7f4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 26 May 2012 01:32:09 +0200 Subject: [PATCH] fixed name clash Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 2 +- src/TortoiseProc/RepositoryBrowser.cpp | 2 +- src/TortoiseProc/resource.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index e79210cf4..934889ae8 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -281,7 +281,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS CAPTION "Repository Browser" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Path:",IDC_REPOURL,9,6,26,11 + LTEXT "Path:",IDC_STATIC_REPOURL,9,6,26,11 EDITTEXT IDC_REPOBROWSER_URL,39,6,128,12,ES_READONLY | NOT WS_BORDER LTEXT "Revision:",IDC_STATIC_REF,172,6,42,11 PUSHBUTTON "HEAD",IDC_BUTTON_REVISION,216,5,193,13 diff --git a/src/TortoiseProc/RepositoryBrowser.cpp b/src/TortoiseProc/RepositoryBrowser.cpp index 106d1b4c5..c41700243 100644 --- a/src/TortoiseProc/RepositoryBrowser.cpp +++ b/src/TortoiseProc/RepositoryBrowser.cpp @@ -172,7 +172,7 @@ BOOL CRepositoryBrowser::OnInitDialog() CResizableStandAloneDialog::OnInitDialog(); CAppUtils::MarkWindowAsUnpinnable(m_hWnd); - AddAnchor(IDC_REPOURL, TOP_LEFT); + AddAnchor(IDC_STATIC_REPOURL, TOP_LEFT); AddAnchor(IDC_REPOBROWSER_URL, TOP_LEFT, TOP_RIGHT); AddAnchor(IDC_STATIC_REF, TOP_RIGHT); AddAnchor(IDC_BUTTON_REVISION, TOP_RIGHT); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 32654de97..800c5cd64 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1010,7 +1010,7 @@ #define IDC_SENDMAIL_ATTACHMENT 1579 #define IDC_REFLOG_LIST 1580 #define IDC_SENDMAIL_SETUP 1580 -#define IDC_REPOURL 1580 +#define IDC_STATIC_REPOURL 1580 #define IDC_COMBOBOXEX_REPOSITORY 1581 #define IDC_COMBOBOXEX_PATH 1582 #define IDC_SENDMAIL_GROUP 1582 -- 2.11.4.GIT