From 97da56e182c28cfa9b9886985ad1a2aff8fe9727 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 2 Jul 2015 20:48:30 +0000
Subject: useless resource removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@14478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdclist/res/resource.rc | 22 ----------------------
 src/core/stdclist/src/resource.h  |  1 -
 src/mir_app/res/resource.rc       |  5 -----
 src/mir_app/src/clui.cpp          | 11 ++---------
 src/mir_app/src/resource.h        |  1 -
 5 files changed, 2 insertions(+), 38 deletions(-)

(limited to 'src')

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index 562231512f..c4e4c4aaa6 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -464,28 +464,6 @@ IDC_DROPUSER            CURSOR                  "dropuser.cur"
 // Menu
 //
 
-IDR_CLISTMENU MENU 
-BEGIN
-    POPUP "&Main menu"
-    BEGIN
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       ID_ICQ_EXIT
-    END
-    POPUP "&Status"
-    BEGIN
-        MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED
-        MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE
-        MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY
-        MENUITEM "&NA\tCtrl+3",                 ID_STATUS_NA
-        MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED
-        MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND
-        MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT
-        MENUITEM "&Invisible\tCtrl+7",          ID_STATUS_INVISIBLE
-        MENUITEM "On the &phone\tCtrl+8",       ID_STATUS_ONTHEPHONE
-        MENUITEM "Out to &lunch\tCtrl+9",       ID_STATUS_OUTTOLUNCH
-    END
-END
-
 IDR_CONTEXT MENU 
 BEGIN
     POPUP "Tray"
diff --git a/src/core/stdclist/src/resource.h b/src/core/stdclist/src/resource.h
index 541c69b212..8b43fed50f 100644
--- a/src/core/stdclist/src/resource.h
+++ b/src/core/stdclist/src/resource.h
@@ -6,7 +6,6 @@
 #define IDR_CONTEXT                     180
 #define IDC_DROP                        183
 #define IDD_OPT_HOTKEY                  184
-#define IDR_CLISTMENU                   199
 #define IDC_HYPERLINKHAND               214
 #define IDC_DROPUSER                    215
 #define IDD_OPT_CLUI                    218
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index ef4583b099..427d481534 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -1230,11 +1230,6 @@ IDC_DROPUSER            CURSOR                  "cursor_drop_user.cur"
 // Menu
 //
 
-IDR_CLISTMENU MENU
-BEGIN
-    MENUITEM SEPARATOR
-END
-
 IDR_CONTEXT MENU
 BEGIN
     POPUP "Tray"
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp
index ba7e7b152e..98920e6dae 100644
--- a/src/mir_app/src/clui.cpp
+++ b/src/mir_app/src/clui.cpp
@@ -251,30 +251,23 @@ int LoadCLUIModule(void)
 	hContactDroppedEvent  = CreateHookableEvent(ME_CLUI_CONTACTDROPPED);
 	hContactDragStopEvent = CreateHookableEvent(ME_CLUI_CONTACTDRAGSTOP);
 
-	WNDCLASSEX wndclass;
+	WNDCLASSEX wndclass = { 0 };
 	wndclass.cbSize = sizeof(wndclass);
 	wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_GLOBALCLASS;
 	wndclass.lpfnWndProc = cli.pfnContactListControlWndProc;
-	wndclass.cbClsExtra = 0;
 	wndclass.cbWndExtra = sizeof(void *);
 	wndclass.hInstance = cli.hInst;
-	wndclass.hIcon = NULL;
 	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wndclass.hbrBackground = NULL;
-	wndclass.lpszMenuName = NULL;
 	wndclass.lpszClassName = _T(CLISTCONTROL_CLASS);
-	wndclass.hIconSm = NULL;
 	RegisterClassEx(&wndclass);
 
+	memset(&wndclass, 0, sizeof(wndclass));
 	wndclass.style = CS_HREDRAW | CS_VREDRAW | ((db_get_b(NULL, "CList", "WindowShadow", 0) == 1) ? CS_DROPSHADOW : 0);
 	wndclass.lpfnWndProc = ContactListWndProc;
-	wndclass.cbClsExtra = 0;
-	wndclass.cbWndExtra = 0;
 	wndclass.hInstance = cli.hInst;
 	wndclass.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA, true);
 	wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wndclass.hbrBackground = (HBRUSH) (COLOR_3DFACE + 1);
-	wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_CLISTMENU);
 	wndclass.lpszClassName = _T(MIRANDACLASS);
 	wndclass.hIconSm = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
 	RegisterClassEx(&wndclass);
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 00027b4c75..18aa499f39 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -81,7 +81,6 @@
 #define IDD_COLORCHOOSER                195
 #define IDD_PROFILEMANAGER              197
 #define IDI_MAINMENU                    198
-#define IDR_CLISTMENU                   199
 #define IDI_BLANK                       200
 #define IDD_FINDADD                     201
 #define IDI_USERONLINE                  201
-- 
cgit v1.2.3