diff options
author | George Hazan <george.hazan@gmail.com> | 2015-07-02 20:48:30 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-07-02 20:48:30 +0000 |
commit | 97da56e182c28cfa9b9886985ad1a2aff8fe9727 (patch) | |
tree | ed0efe2daf1f3bf8192f492a2b4411d617d94820 | |
parent | cdd0b356b00028e3146e58bb7412af159587bf66 (diff) |
useless resource removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@14478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | plugins/Clist_modern/res/resource.rc | 22 | ||||
-rw-r--r-- | plugins/Clist_modern/src/resource.h | 1 | ||||
-rw-r--r-- | plugins/Clist_nicer/res/resource.rc | 22 | ||||
-rw-r--r-- | plugins/Clist_nicer/src/resource.h | 1 | ||||
-rw-r--r-- | src/core/stdclist/res/resource.rc | 22 | ||||
-rw-r--r-- | src/core/stdclist/src/resource.h | 1 | ||||
-rw-r--r-- | src/mir_app/res/resource.rc | 5 | ||||
-rw-r--r-- | src/mir_app/src/clui.cpp | 11 | ||||
-rw-r--r-- | src/mir_app/src/resource.h | 1 |
9 files changed, 2 insertions, 84 deletions
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index 70f0e758e6..d7b23e59f8 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -915,28 +915,6 @@ IDR_MSF_DEFAULT_SKIN MSF "skin.msf" // 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/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h index 7fbac92156..333a807b44 100644 --- a/plugins/Clist_modern/src/resource.h +++ b/plugins/Clist_modern/src/resource.h @@ -20,7 +20,6 @@ #define IDR_CONTEXT 180
#define IDC_DROP 183
#define IDI_SENDEMAIL 193
-#define IDR_CLISTMENU 199
#define IDI_BLANK 200
#define IDD_OPT_ICONS 207
#define IDI_FILE 207
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 28fbc2cd53..82d8389117 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -579,28 +579,6 @@ IDC_DROPUSER CURSOR "..\\..\\..\\src\\mir_app\\res\\ // 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/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h index abb763ae2e..50f46768d9 100644 --- a/plugins/Clist_nicer/src/resource.h +++ b/plugins/Clist_nicer/src/resource.h @@ -18,7 +18,6 @@ #define IDI_CLVM_SELECT 177
#define IDR_CONTEXT 180
#define IDC_DROP 183
-#define IDR_CLISTMENU 199
#define IDI_BLANK 200
#define IDI_ADDCONTACT 210
#define IDC_HYPERLINKHAND 214
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
|