minus ModernOpt

5 files changed, 0 insertions, 93 deletions

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 8468088d51..0beae07eec 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -443,28 +443,3 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 	Options_AddPage(wParam, &odp);

 	return 0;

 }

-

-int ClcModernOptInit(WPARAM wParam, LPARAM)

-{

-	static int iBoldControls[] =

-	{

-		IDC_TXT_TITLE1, IDC_TXT_TITLE2,

-		MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = { 0 };

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR;

-	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

-	obj.hInstance = g_hInst;

-	obj.iSection = MODERNOPT_PAGE_SKINS;

-	obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;

-	obj.lptzSubsection = LPGENW("Contact list");

-	obj.iBoldControls = iBoldControls;

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLCBKG);

-	obj.pfnDlgProc = DlgProcClcBkgOpts;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 55cf7d2c49..8a92ee1146 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -208,29 +208,3 @@ int CListOptInit(WPARAM wParam, LPARAM)
 	Options_AddPage(wParam, &odp);

 	return 0;

 }

-

-int CListModernOptInit(WPARAM wParam, LPARAM)

-{

-	static int iBoldControls[] =

-	{

-		IDC_TXT_TITLE1, IDC_TXT_TITLE2,

-		MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = { 0 };

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

-	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

-	obj.hInstance = g_hInst;

-	obj.iSection = MODERNOPT_PAGE_CLIST;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.iBoldControls = iBoldControls;

-	obj.lpzClassicGroup = LPGEN("Contact list");

-	obj.lpzClassicPage = "List";

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLIST);

-	obj.pfnDlgProc = DlgProcGenOpts;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index b4835091e3..e97dcc9667 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -331,34 +331,3 @@ int CluiOptInit(WPARAM wParam, LPARAM)
 	Options_AddPage(wParam, &odp);

 	return 0;

 }

-

-int CluiModernOptInit(WPARAM wParam, LPARAM)

-{

-	static int iBoldControls[] =

-	{

-		IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_SHOWSBAR,

-		MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = { 0 };

-

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

-	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

-	obj.hInstance = g_hInst;

-	obj.iSection = MODERNOPT_PAGE_CLIST;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.iBoldControls = iBoldControls;

-	obj.lpzClassicGroup = LPGEN("Contact list");

-	obj.lpzClassicPage = "List";

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLUI);

-	obj.pfnDlgProc = DlgProcCluiOpts;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_SBAR);

-	obj.pfnDlgProc = DlgProcSBarOpts;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 3e0b594684..75caafbfd1 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -91,10 +91,8 @@ static int OnAccountsChanged(WPARAM, LPARAM)
 /////////////////////////////////////////////////////////////////////////////////////////

 // called when all modules got loaded

 

-static int OnModernOptsInit(WPARAM wParam, LPARAM lParam);

 static int OnModulesLoaded(WPARAM, LPARAM)

 {

-	HookEvent(ME_MODERNOPT_INITIALIZE, OnModernOptsInit);

 	RegisterCListFonts();

 	himlCListClc = Clist_GetImageList();

 	return 0;

@@ -111,14 +109,6 @@ static int OnOptsInit(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static int OnModernOptsInit(WPARAM wParam, LPARAM lParam)

-{

-	ClcModernOptInit(wParam, lParam);

-	CListModernOptInit(wParam, lParam);

-	CluiModernOptInit(wParam, lParam);

-	return 0;

-}

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // menu status services

 

diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h
index 35286fe2f9..c5b5d0a3a7 100644
--- a/src/core/stdclist/src/stdafx.h
+++ b/src/core/stdclist/src/stdafx.h
@@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_button.h>

 #include <m_options.h>

-#include <m_modernopt.h>

 #include <m_protosvc.h>

 #include <m_utils.h>

 #include <m_skin.h>