added toptoolbar support

fixed autoupdate saving setting
cleanup

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

1 files changed, 7 insertions, 19 deletions

diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h
index e4acc35e04..694a475549 100644
--- a/plugins/Weather/src/weather.h
+++ b/plugins/Weather/src/weather.h
@@ -1,6 +1,6 @@
 /*

-Weather Protocol plugin for Miranda IM

-Copyright (c) 2012 Miranda NG Team

+Weather Protocol plugin for Miranda NG

+Copyright (c) 2012-2013 Miranda NG Team

 Copyright (c) 2005-2011 Boris Krasnovskiy All Rights Reserved

 Copyright (c) 2002-2005 Calvin Che

 

@@ -26,35 +26,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #define _CRT_SECURE_NO_WARNINGS

 #include <m_stdhdr.h>

-

-#include <stdio.h>

-#include <io.h>

 #include <share.h>

-#include <direct.h>

-#include <process.h>

 #include <time.h>

-

 #include <windows.h>

 #include <commctrl.h>

 #include <richedit.h>

 

-#include <win2k.h>

-

-#define MIRANDA_VER 0x0A00

-

 #include <newpluginapi.h>

-#include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_protomod.h>

-#include <m_protosvc.h>

-#include <m_clist.h>

 #include <m_icolib.h>

 #include <m_options.h>

 #include <m_langpack.h>

 #include <m_skin.h>

 #include <m_database.h>

 #include <m_history.h>

-#include <m_utils.h>

 #include <m_userinfo.h>

 #include <m_netlib.h>

 #include <m_ignore.h>

@@ -66,10 +52,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_fontservice.h>

 #include <m_skin_eng.h>

 #include <m_cluiframes.h>

-

 #include <m_popup.h>

+#include <win2k.h>

+

+#include <m_weather.h>

+#include <m_toptoolbar.h>

 

-#include "m_weather.h"

 #include "resource.h"

 #include "version.h"

 

@@ -373,7 +361,7 @@ extern HANDLE hHookWeatherUpdated;
 extern HANDLE hHookWeatherError;

 extern HANDLE hWindowList;

 extern HANDLE hMwinMenu;

-

+extern HANDLE hTBButton;

 extern UINT_PTR timerId;

 

 // check if weather is currently updating