fix compile isses
This commit is contained in:
		
							parent
							
								
									d5b4137ead
								
							
						
					
					
						commit
						650713a1e6
					
				| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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) { }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue