From 634de62135f91b5ed180a16085de6f3604bcd7d0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 20 Nov 2011 17:56:40 +0100 Subject: [PATCH] drop IDD_SWITCH_LOCAL_BRANCH Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 18 ---------------- src/TortoiseProc/SwitchLocalBranchPage.cpp | 33 ------------------------------ src/TortoiseProc/SwitchLocalBranchPage.h | 21 ------------------- src/TortoiseProc/resource.h | 1 - 4 files changed, 73 deletions(-) delete mode 100644 src/TortoiseProc/SwitchLocalBranchPage.cpp delete mode 100644 src/TortoiseProc/SwitchLocalBranchPage.h diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index ea0c7677c..397de3e2e 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1221,16 +1221,6 @@ BEGIN LTEXT "Static",IDC_STATIC,25,23,19,8 END -IDD_SWITCH_LOCAL_BRANCH DIALOGEX 0, 0, 244, 126 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Local Branch" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - CONTROL "",IDC_BRANCH,"ComboBoxEx32",CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP,77,19,135,30 - LTEXT "Local Branch:",IDC_STATIC,25,20,45,8 - EDITTEXT IDC_LOG,25,42,189,70,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY -END - IDD_SWITCH_VERSION DIALOGEX 0, 0, 244, 126 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Version" @@ -2301,14 +2291,6 @@ BEGIN BOTTOMMARGIN, 119 END - IDD_SWITCH_LOCAL_BRANCH, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 237 - TOPMARGIN, 7 - BOTTOMMARGIN, 119 - END - IDD_SWITCH_VERSION, DIALOG BEGIN LEFTMARGIN, 7 diff --git a/src/TortoiseProc/SwitchLocalBranchPage.cpp b/src/TortoiseProc/SwitchLocalBranchPage.cpp deleted file mode 100644 index f1cf98997..000000000 --- a/src/TortoiseProc/SwitchLocalBranchPage.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// SwitchLocalBranchPage.cpp : implementation file -// - -#include "stdafx.h" -#include "TortoiseProc.h" -#include "SwitchLocalBranchPage.h" - - -// SwitchLocalBranchPage dialog - -IMPLEMENT_DYNAMIC(SwitchLocalBranchPage, CPropertyPage) - -SwitchLocalBranchPage::SwitchLocalBranchPage() - : CPropertyPage(SwitchLocalBranchPage::IDD) -{ - -} - -SwitchLocalBranchPage::~SwitchLocalBranchPage() -{ -} - -void SwitchLocalBranchPage::DoDataExchange(CDataExchange* pDX) -{ - CPropertyPage::DoDataExchange(pDX); -} - - -BEGIN_MESSAGE_MAP(SwitchLocalBranchPage, CPropertyPage) -END_MESSAGE_MAP() - - -// SwitchLocalBranchPage message handlers diff --git a/src/TortoiseProc/SwitchLocalBranchPage.h b/src/TortoiseProc/SwitchLocalBranchPage.h deleted file mode 100644 index 95a12e165..000000000 --- a/src/TortoiseProc/SwitchLocalBranchPage.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - - -// SwitchLocalBranchPage dialog - -class SwitchLocalBranchPage : public CPropertyPage -{ - DECLARE_DYNAMIC(SwitchLocalBranchPage) - -public: - SwitchLocalBranchPage(); - virtual ~SwitchLocalBranchPage(); - -// Dialog Data - enum { IDD = IDD_SWITCH_LOCAL_BRANCH }; - -protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - - DECLARE_MESSAGE_MAP() -}; diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 09567e6a7..0d6303c23 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -134,7 +134,6 @@ #define IDD_PUSH 303 #define IDD_GITSWITCH 304 #define IDD_SWITCH_REMOTEL_BRANCH 305 -#define IDD_SWITCH_LOCAL_BRANCH 306 #define IDD_SWITCH_VERSION 307 #define IDD_SWITCH_TAG1 308 #define IDD_NEW_BRANCH_TAG 309 -- 2.11.4.GIT