Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naur cegui-0.8.3/cegui/include/CEGUI/falagard/FormattingSetting.h cegui-0.8.3_/cegui/include/CEGUI/falagard/FormattingSetting.h
- --- cegui-0.8.3/cegui/include/CEGUI/falagard/FormattingSetting.h Sat Dec 7 08:37:08 2013
- +++ cegui-0.8.3_/cegui/include/CEGUI/falagard/FormattingSetting.h Mon Feb 10 14:06:24 2014
- @@ -121,22 +121,8 @@
- String d_propertySource;
- };
- -template<> void CEGUIEXPORT FormattingSetting<VerticalFormatting>::writeXMLTagToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<VerticalFormatting>::writeXMLAttributesToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<HorizontalFormatting>::writeXMLTagToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<HorizontalFormatting>::writeXMLAttributesToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<VerticalTextFormatting>::writeXMLTagToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<VerticalTextFormatting>::writeXMLAttributesToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<HorizontalTextFormatting>::writeXMLTagToStream(
- - XMLSerializer& xml_stream) const;
- -template<> void CEGUIEXPORT FormattingSetting<HorizontalTextFormatting>::writeXMLAttributesToStream(
- - XMLSerializer& xml_stream) const;
- +template class FormattingSetting<VerticalFormatting>;
- +template class FormattingSetting<HorizontalFormatting>;
- }
- #endif
- diff -Naur cegui-0.8.3/cegui/src/Scheme.cpp cegui-0.8.3_/cegui/src/Scheme.cpp
- --- cegui-0.8.3/cegui/src/Scheme.cpp Sat Dec 7 08:37:08 2013
- +++ cegui-0.8.3_/cegui/src/Scheme.cpp Mon Feb 10 14:31:23 2014
- @@ -62,7 +62,13 @@
- // Start of CEGUI namespace section
- namespace CEGUI
- {
- -
- + extern "C" {
- + CEGUI::FactoryModule& getWindowFactoryModule()
- + {
- + static CEGUI::FactoryModule mod;
- + return mod;
- + }
- + }
- /*************************************************************************
- Static Data definitions
- *************************************************************************/
- diff -Naur cegui-0.8.3/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt cegui-0.8.3_/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt
- --- cegui-0.8.3/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt Thu Feb 20 01:40:55 2014
- +++ cegui-0.8.3_/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt Sat Feb 1 22:32:27 2014
- @@ -16,6 +16,7 @@
- if (CEGUI_BUILD_STATIC_CONFIGURATION)
- add_executable(${CEGUI_TARGET_NAME}_Static ${CORE_SOURCE_FILES})
- + add_definitions(-DTOLUA_STATIC)
- if (CEGUI_HAS_BUILD_SUFFIX AND CEGUI_BUILD_SUFFIX)
- set_target_properties(${CEGUI_TARGET_NAME}_Static PROPERTIES
- OUTPUT_NAME_DEBUG "${CEGUI_TARGET_NAME}_Static${CEGUI_BUILD_SUFFIX}"
- diff -Naur cegui-0.8.3/cegui/src/falagard/FormattingSetting.cpp cegui-0.8.3_/cegui/src/falagard/FormattingSetting.cpp
- --- cegui-0.8.3/cegui/src/falagard/FormattingSetting.cpp Sat Dec 7 08:37:10 2013
- +++ cegui-0.8.3_/cegui/src/falagard/FormattingSetting.cpp Mon Feb 10 14:06:30 2014
- @@ -29,91 +29,6 @@
- namespace CEGUI
- {
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<VerticalFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.openTag("VertFormat");
- - else
- - xml_stream.openTag("VertFormatProperty");
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<VerticalFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.attribute("type",
- - FalagardXMLHelper<VerticalFormatting>::toString(d_value));
- - else
- - xml_stream.attribute("name", d_propertySource);
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<HorizontalFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.openTag("HorzFormat");
- - else
- - xml_stream.openTag("HorzFormatProperty");
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<HorizontalFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.attribute("type",
- - FalagardXMLHelper<HorizontalFormatting>::toString(d_value));
- - else
- - xml_stream.attribute("name", d_propertySource);
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<VerticalTextFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.openTag("VertFormat");
- - else
- - xml_stream.openTag("VertFormatProperty");
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<VerticalTextFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.attribute("type",
- - FalagardXMLHelper<VerticalTextFormatting>::toString(d_value));
- - else
- - xml_stream.attribute("name", d_propertySource);
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<HorizontalTextFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.openTag("HorzFormat");
- - else
- - xml_stream.openTag("HorzFormatProperty");
- -}
- -
- -//----------------------------------------------------------------------------//
- -template<>
- -void FormattingSetting<HorizontalTextFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
- -{
- - if (d_propertySource.empty())
- - xml_stream.attribute("type",
- - FalagardXMLHelper<HorizontalTextFormatting>::toString(d_value));
- - else
- - xml_stream.attribute("name", d_propertySource);
- -}
- -
- -//----------------------------------------------------------------------------//
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement