NewStory: remove useless "Close" button

5 files changed, 3 insertions, 16 deletions

diff --git a/plugins/NewStory/res/11 close.ico b/plugins/NewStory/res/11 close.ico
deleted file mode 100644
index a18dfd8b09..0000000000
--- a/plugins/NewStory/res/11 close.ico
+++ /dev/null
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 6acaa04917..ddcb6b3394 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -35,7 +35,6 @@ ICO_FILTER                       ICON         "06 filter.ico"
 ICO_EXPORT                       ICON         "07 export.ico"
 ICO_COPY                       ICON         "09 copy.ico"
 ICO_SENDMSG                       ICON         "10 sendmsg.ico"
-ICO_CLOSE                      ICON         "11 close.ico"
 ICO_MSGIN                      ICON         "12 msgin.ico"
 ICO_MSGOUT                      ICON         "13 msgout.ico"
 ICO_SIGNIN                      ICON         "14 signin.ico"
@@ -91,7 +90,6 @@ STYLE DS_SETFONT | DS_NOIDLEMSG | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
 CAPTION "NewStory - New History for Miranda IM"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_CLOSE,"MButtonClass",WS_TABSTOP,364,99,16,14
     CONTROL         "",IDC_MESSAGE,"MButtonClass",WS_TABSTOP,37,99,16,14
     CONTROL         "",IDC_USERINFO,"MButtonClass",WS_TABSTOP,0,99,16,14
     CONTROL         "",IDC_USERMENU,"MButtonClass",WS_TABSTOP,21,99,16,14
diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index 143246d1be..33b7fe8389 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -171,11 +171,11 @@ enum
 	TBTN_USERINFO, TBTN_USERMENU, TBTN_MESSAGE,
 	TBTN_SEARCH, TBTN_FILTER, TBTN_DATEPOPUP,
 	TBTN_COPY, TBTN_EXPORT,
-	TBTN_LOGOPTIONS, TBTN_CLOSE,
+	TBTN_LOGOPTIONS,
 	TBTN_COUNT
 };
 
-int tbtnSpacing[TBTN_COUNT] = { 0, 0, TBTN_SPACER, 0, 0, TBTN_SPACER, 0, -1, 0, 0 };
+int tbtnSpacing[TBTN_COUNT] = { 0, 0, TBTN_SPACER, 0, 0, TBTN_SPACER, 0, -1, 0 };
 
 struct InfoBarEvents
 {
@@ -397,7 +397,7 @@ class CHistoryDlg : public CDlgBase
 	CCtrlBase m_histControl;
 	CCtrlEdit edtSearchText;
 	CCtrlMButton btnUserInfo, btnSendMsg, btnUserMenu, btnCopy, btnOptions, btnFilter;
-	CCtrlMButton btnCalendar, btnSearch, btnExport, btnClose, btnFindNext, btnFindPrev;
+	CCtrlMButton btnCalendar, btnSearch, btnExport, btnFindNext, btnFindPrev;
 	CCtrlTreeView m_timeTree;
 
 public:
@@ -408,7 +408,6 @@ public:
 		m_histControl(this, IDC_ITEMS2),
 		edtSearchText(this, IDC_SEARCHTEXT),
 		btnCopy(this, IDC_COPY, g_plugin.getIcon(ICO_COPY), LPGEN("Copy")),
-		btnClose(this, IDC_CLOSE, g_plugin.getIcon(ICO_CLOSE), LPGEN("Close")),
 		btnExport(this, IDC_EXPORT, g_plugin.getIcon(ICO_EXPORT), LPGEN("Export...")),
 		btnFilter(this, IDC_FILTER, g_plugin.getIcon(ICO_FILTER), LPGEN("Filter")),
 		btnSearch(this, IDC_SEARCH, g_plugin.getIcon(ICO_SEARCH), LPGEN("Search...")),
@@ -425,7 +424,6 @@ public:
 		edtSearchText.OnChange = Callback(this, &CHistoryDlg::onChange_SearchText);
 
 		btnCopy.OnClick = Callback(this, &CHistoryDlg::onClick_Copy);
-		btnClose.OnClick = Callback(this, &CHistoryDlg::onClick_Close);
 		btnExport.OnClick = Callback(this, &CHistoryDlg::onClick_Export);
 		btnFilter.OnClick = Callback(this, &CHistoryDlg::onClick_Filter);
 		btnSearch.OnClick = Callback(this, &CHistoryDlg::onClick_Search);
@@ -475,7 +473,6 @@ public:
 		m_hwndBtnToolbar[TBTN_LOGOPTIONS] = btnOptions.GetHwnd();
 		m_hwndBtnToolbar[TBTN_FILTER] = btnFilter.GetHwnd();
 		m_hwndBtnToolbar[TBTN_DATEPOPUP] = btnCalendar.GetHwnd();
-		m_hwndBtnToolbar[TBTN_CLOSE] = btnClose.GetHwnd();
 
 		m_hwndBtnCloseSearch = GetDlgItem(m_hwnd, IDC_SEARCHICON);
 		m_hwndStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, 0, 0, 0, 0, m_hwnd, NULL, g_plugin.getInst(), NULL);
@@ -608,11 +605,6 @@ public:
 			m_histControl.SendMsg(NSM_SEEKTIME, tm_jump, 0);
 	}
 
-	void onClick_Close(CCtrlButton *)
-	{
-		Close();
-	}
-	
 	void onClick_Copy(CCtrlButton *)
 	{
 		m_histControl.SendMsg(NSM_COPY, 0, 0);
diff --git a/plugins/NewStory/src/main.cpp b/plugins/NewStory/src/main.cpp
index 32f7892111..b5fb6a8591 100644
--- a/plugins/NewStory/src/main.cpp
+++ b/plugins/NewStory/src/main.cpp
@@ -51,7 +51,6 @@ static IconItem icons[] =
 	{ LPGEN("Export"),            "export",    ICO_EXPORT     },
 	{ LPGEN("Copy"),              "copy",      ICO_COPY       },
 	{ LPGEN("Send Message"),      "message",   ICO_SENDMSG    },
-	{ LPGEN("Close"),             "close",     ICO_CLOSE      },
 
 	{ LPGEN("Incoming Message"),  "msgin",     ICO_MSGIN      },
 	{ LPGEN("Outgoing Message"),  "msgout",    ICO_MSGOUT     },
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 0de2835510..749746c9e7 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -19,7 +19,6 @@
 #define ICO_EXPORT                      133
 #define ICO_COPY                        134
 #define ICO_SENDMSG                     135
-#define ICO_CLOSE                       136
 #define ICO_MSGIN                       137
 #define ICO_MSGOUT                      138
 #define ICO_SIGNIN                      139
@@ -38,7 +37,6 @@
 #define IDC_PROGRESS                    1002 //!!!
 #define IDC_EDIT1                       1003 //!!!
 #define IDC_SEARCHTEXT                  1004
-#define IDC_CLOSE                       1009
 #define IDC_MESSAGE                     1010
 #define IDC_USERINFO                    1011
 #define IDC_USERMENU                    1012