From 60f8115a8f4f9a771096dd6f669131a18876d1f2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 6 Mar 2017 22:12:20 +0300
Subject: tabSRMM: header files partially merged

---
 plugins/TabSRMM/src/chat/chat_resource.h | 5 -----
 plugins/TabSRMM/src/resource.h           | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/chat/chat_resource.h b/plugins/TabSRMM/src/chat/chat_resource.h
index 277097f308..ee8255a0db 100644
--- a/plugins/TabSRMM/src/chat/chat_resource.h
+++ b/plugins/TabSRMM/src/chat/chat_resource.h
@@ -11,11 +11,6 @@
 #define IDD_OPTIONS3                    407
 #define IDD_OPTIONS4                    408
 #define IDD_ADDHIGHLIGHT                409
-#define IDC_SMILEY                      1007
-#define IDC_FILTER                      1013
-#define IDC_CHANMGR                     1014
-#define IDC_SHOWNICKLIST                1015
-#define IDC_BKGCOLOR                    1019
 #define IDC_CHECKBOXES                  1021
 #define IDC_NICKROW2                    1023
 #define IDC_NICKROW                     1024
diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 5f725e24e6..1c4027ffcb 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -81,6 +81,7 @@
 #define IDC_FASTGRADIENT                1008
 #define IDC_SPLITTERY                   1008
 #define IDC_CHKNOTIFY_URL               1009
+#define IDC_CHANMGR                     1010
 #define IDC_USESKIN                     1011
 #define IDC_AUTOCLOSE                   1012
 #define IDC_CHKNOTIFY_OTHER             1013
@@ -98,8 +99,10 @@
 #define IDC_CLOSE                       1024
 #define IDC_SAVE                        1025
 #define IDC_CHKACTR_DISMISS             1026
+#define IDC_BKGCOLOR                    1027
 #define IDC_CHKACTR_OPEN                1028
 #define IDC_CONTACTPIC                  1029
+#define IDC_SHOWNICKLIST                1030
 #define IDC_ST_ENTERMSG                 1031
 #define IDC_PANELNICK                   1032
 #define IDC_CHKWINDOWCHECK              1032
@@ -107,6 +110,7 @@
 #define IDC_CHKPREVIEW                  1034
 #define IDC_CHKINFINITE                 1035
 #define IDC_PANELSTATUS                 1036
+#define IDC_FILTER                      1037
 #define IDC_CHKDEFAULTCOL_MESSAGE       1038
 #define IDC_CHKDEFAULTCOL_MUC           1039
 #define IDC_CHKDEFAULTCOL_ERR           1040
-- 
cgit v1.2.3