From 3d60e28ce573bfd28286d108eeb43ec29bf44d48 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 16 Sep 2013 14:27:58 +0000 Subject: removed not needed _MSC_VER checks removed double comstant from modern warning fix git-svn-id: http://svn.miranda-ng.org/main/trunk@6087 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_defsettings.h | 1 - plugins/Clist_modern/src/modern_clui.cpp | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/hdr/modern_defsettings.h b/plugins/Clist_modern/src/hdr/modern_defsettings.h index dd7e451aaa..ca03dcdd6f 100644 --- a/plugins/Clist_modern/src/hdr/modern_defsettings.h +++ b/plugins/Clist_modern/src/hdr/modern_defsettings.h @@ -33,7 +33,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SETTING_TOOLWINDOW_DEFAULT 1 //"CList","ToolWindow" #define SETTING_ONTOP_DEFAULT 0 //"CList","OnTop" #define SETTING_MIN2TRAY_DEFAULT 1 //"CList","Min2Tray" -#define SETTING_TRAY1CLICK_DEFAULT 1 //"CList","Tray1Click" #define SETTING_HIDEOFFLINE_DEFAULT 0 //"CList", "HideOffline" #define SETTING_HIDEEMPTYGROUPS_DEFAULT 0 //"CList","HideEmptyGroups" #define SETTING_USEGROUPS_DEFAULT 1 //"CList","UseGroups" diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index d8ad4dda50..8a6e0eedb5 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -41,20 +41,18 @@ BOOL CALLBACK ProcessCLUIFrameInternalMsg(HWND hwnd, UINT msg, WPARAM wParam, LP void DestroyTrayMenu(HMENU hMenu); // new sources -#ifdef _MSC_VER #include -#endif /* Global variables */ UINT g_dwMainThreadID = 0; HANDLE g_hAwayMsgThread = 0, g_hGetTextAsyncThread = 0, g_hSmoothAnimationThread = 0; - + HMENU g_hMenuMain; BOOL g_bTransparentFlag = FALSE; -BOOL g_mutex_bChangingMode = FALSE, g_mutex_bSizing = FALSE; - +BOOL g_mutex_bChangingMode = FALSE, g_mutex_bSizing = FALSE; + BOOL g_flag_bOnModulesLoadedCalled = FALSE; RECT g_rcEdgeSizingRect={0}; @@ -77,7 +75,7 @@ static BOOL mutex_bAnimationInProgress=FALSE, mutex_bDisableAutoUpdate=TRUE, mutex_bDuringSizing=FALSE, mutex_bDelayedSizing=FALSE; //TBC is it need? - + static BOOL flag_bFirstTimeCall=FALSE; static BOOL bTransparentFocus=TRUE, @@ -92,7 +90,7 @@ static int nLastRequiredHeight=0, nRequiredHeight=0, nMirMenuState=0, nStatusMenuState=0; - + static RECT rcNewWindowRect={0}, rcOldWindowRect ={0}, rcSizingRect={0}, -- cgit v1.2.3