From 650713a1e6d388b14793a6908fd24b76e81d8049 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Sat, 5 Nov 2011 11:36:02 -0200
Subject: [PATCH] fix compile isses

---
 CMakeLists.txt                 | 2 +-
 src/framework/core/logger.h    | 1 +
 src/framework/ui/uimanager.cpp | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d9feb91..bb562fe3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,7 +149,7 @@ ENDIF(FORBIDDEN_FUNCTIONS)
 
 IF(WIN32)
     SET(SOURCES ${SOURCES} src/framework/platform/win32platform.cpp)
-    SET(ADDITIONAL_LIBRARIES ws2_32)
+    SET(ADDITIONAL_LIBRARIES ws2_32 mswsock)
 
     IF(CMAKE_COMPILER_IS_GNUCXX)
         ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
diff --git a/src/framework/core/logger.h b/src/framework/core/logger.h
index 93455a02..0088cd84 100644
--- a/src/framework/core/logger.h
+++ b/src/framework/core/logger.h
@@ -27,6 +27,7 @@
 #include "../const.h"
 #include <vector>
 #include <functional>
+#include <list>
 
 struct LogMessage {
   LogMessage(Fw::LogLevel level, const std::string& message, std::size_t when) : level(level), message(message), when(when) { }
diff --git a/src/framework/ui/uimanager.cpp b/src/framework/ui/uimanager.cpp
index e55ab39c..3de71c1c 100644
--- a/src/framework/ui/uimanager.cpp
+++ b/src/framework/ui/uimanager.cpp
@@ -131,9 +131,13 @@ void UIManager::importStyleFromOTML(const OTMLNodePtr& styleNode)
     boost::trim(name);
     boost::trim(base);
 
+    // TODO: styles must be searched by widget scopes, in that way this warning could be fixed
+    // disable this warning because many ppl was complening about it
+    /*
     auto it = m_styles.find(name);
     if(it != m_styles.end())
         logWarning("style '", name, "' is being redefined");
+    */
 
     OTMLNodePtr style = getStyle(base)->clone();
     style->merge(styleNode);