WinterSpeak: minor ressource fixes and slightly redesigned dialog (fixes #475)

git-svn-id: http://svn.miranda-ng.org/main/trunk@6549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 9 insertions, 10 deletions

diff --git a/plugins/WinterSpeak/src/ProtocolInformation.cpp b/plugins/WinterSpeak/src/ProtocolInformation.cpp
index d601fa6757..5fff2526af 100644
--- a/plugins/WinterSpeak/src/ProtocolInformation.cpp
+++ b/plugins/WinterSpeak/src/ProtocolInformation.cpp
@@ -27,7 +27,7 @@ ProtocolInformation::~ProtocolInformation()
 	}

 }

 

-void CALLBACK ProtocolInformation::TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)

+void CALLBACK ProtocolInformation::TimerProc(HWND, UINT, UINT_PTR, DWORD)

 {

 	ProtocolTimeout pt = m_instance->m_protocol_timeout.front();    

 	

@@ -46,7 +46,7 @@ void ProtocolInformation::disable(const char *protocol)
 

 	const unsigned int TIMEOUT = 10000;

 

-	unsigned int t  = SetTimer(NULL, (UINT_PTR)this, TIMEOUT, (TIMERPROC)TimerProc);

+	unsigned int t  = SetTimer(NULL, (UINT_PTR)this, TIMEOUT, TimerProc);

 	m_protocol_timeout.push_back(std::make_pair(protocol, t));

 }

 

diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp
index 301d165901..2bbd768ae9 100644
--- a/plugins/WinterSpeak/src/main.cpp
+++ b/plugins/WinterSpeak/src/main.cpp
@@ -63,7 +63,7 @@ int eventMessageAdded(WPARAM wParam, LPARAM lParam)
 //-----------------------------------------------------------------------------

 // Description : a messaging protocol changed state

 //-----------------------------------------------------------------------------

-int protocolAck(WPARAM wParam, LPARAM lParam)

+int protocolAck(WPARAM, LPARAM lParam)

 {

 	g_speak_announce->protocolAck(reinterpret_cast<ACKDATA *>(lParam));

 	

diff --git a/plugins/WinterSpeak/src/resource.h b/plugins/WinterSpeak/src/resource.h
index 6775f8d314..d15b8b8c9a 100644
--- a/plugins/WinterSpeak/src/resource.h
+++ b/plugins/WinterSpeak/src/resource.h
@@ -1,12 +1,13 @@
 //{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

-// Used by Restart.rc

+// Microsoft Visual C++ generated include file.

+// Used by ..\res\Speak.rc

 //

 #define IDD_CONFIG                      101

 #define IDD_ANNOUNCE                    102

 #define IDD_ACTIVEMODES                 103

 #define IDI_RECVMSG                     136

 #define IDI_USERONLINE                  201

+#define IDD_TTS_LEXICON                 201

 #define IDI_FILLEDBLOB                  212

 #define IDI_EMPTYBLOB                   213

 #define IDC_SELECT_ENGINE               1001

@@ -44,14 +45,12 @@
 #define IDC_DIALOG_OPEN                 1116

 #define IDC_DIALOG_FOCUSED              1117

 #define IDC_ACTIVE_USERS                1118

+#define IDC_SUPPRESS_CONNECT            1121

+#define IDC_CONFIG_LEXICON              1122

 #define IDC_ONLINEICON                  1207

-#define IDC_MSGICON                     1375

 #define IDC_ALLICON                     1208

 #define IDC_NONEICON                    1209

-#define IDC_SUPPRESS_CONNECT            1121

-#define IDC_CONFIG_LEXICON              1122

-

-#define IDD_TTS_LEXICON                 201

+#define IDC_MSGICON                     1375

 #define IDC_TTS_LEXICON_LIST            2001

 #define IDC_TTS_LEXICON_ORIGINAL        2002

 #define IDC_TTS_LEXICON_FINAL           2003