Browse Source

Try fixing compilation on MaxOSX and X11

Michael Ragazzon 6 years ago
parent
commit
b9450f7980

+ 1 - 1
Samples/shell/src/macosx/InputMacOSX.cpp

@@ -129,7 +129,7 @@ OSStatus InputMacOSX::EventHandler(EventHandlerCallRef next_handler, EventRef ev
 						if (key_identifier != Rml::Core::Input::KI_UNKNOWN)
 						if (key_identifier != Rml::Core::Input::KI_UNKNOWN)
 							context->ProcessKeyDown(key_identifier, key_modifier_state);
 							context->ProcessKeyDown(key_identifier, key_modifier_state);
 
 
-						Rml::Core::word character = GetCharacterCode(key_identifier, key_modifier_state);
+						Rml::Core::Character character = GetCharacterCode(key_identifier, key_modifier_state);
 						if (character > 0)
 						if (character > 0)
 							context->ProcessTextInput(character);
 							context->ProcessTextInput(character);
 					}
 					}

+ 3 - 3
Samples/shell/src/macosx/ShellMacOSX.cpp

@@ -55,7 +55,7 @@ static const EventTypeSpec WINDOW_EVENTS[] = {
 
 
 static WindowRef window;
 static WindowRef window;
 static timeval start_time;
 static timeval start_time;
-static Rml::Core::WString clipboard_text;
+static Rml::Core::String clipboard_text;
 
 
 static std::unique_ptr<ShellFileInterface> file_interface;
 static std::unique_ptr<ShellFileInterface> file_interface;
 
 
@@ -258,13 +258,13 @@ void Shell::SetMouseCursor(const Rml::Core::String& cursor_name)
 }
 }
 
 
 
 
-void Shell::SetClipboardText(const Rml::Core::WString& text)
+void Shell::SetClipboardText(const Rml::Core::String& text)
 {
 {
 	// Todo: interface with system clipboard
 	// Todo: interface with system clipboard
 	clipboard_text = text;
 	clipboard_text = text;
 }
 }
 
 
-void Shell::GetClipboardText(Rml::Core::WString& text)
+void Shell::GetClipboardText(Rml::Core::String& text)
 {
 {
 	// Todo: interface with system clipboard
 	// Todo: interface with system clipboard
 	text = clipboard_text;
 	text = clipboard_text;

+ 1 - 1
Samples/shell/src/x11/InputX11.cpp

@@ -168,7 +168,7 @@ void InputX11::ProcessXEvent(Display* display, const XEvent& event)
 			if (key_identifier != Rml::Core::Input::KI_UNKNOWN)
 			if (key_identifier != Rml::Core::Input::KI_UNKNOWN)
 				context->ProcessKeyDown(key_identifier, key_modifier_state);
 				context->ProcessKeyDown(key_identifier, key_modifier_state);
 
 
-			Rml::Core::word character = GetCharacterCode(key_identifier, key_modifier_state);
+			Rml::Core::Character character = GetCharacterCode(key_identifier, key_modifier_state);
 			if (character > 0)
 			if (character > 0)
 				context->ProcessTextInput(character);
 				context->ProcessTextInput(character);
 		}
 		}

+ 3 - 3
Samples/shell/src/x11/ShellX11.cpp

@@ -46,7 +46,7 @@
 static bool running = false;
 static bool running = false;
 static int screen = -1;
 static int screen = -1;
 static timeval start_time;
 static timeval start_time;
-static Rml::Core::WString clipboard_text;
+static Rml::Core::String clipboard_text;
 
 
 static std::unique_ptr<ShellFileInterface> file_interface;
 static std::unique_ptr<ShellFileInterface> file_interface;
 
 
@@ -346,13 +346,13 @@ void Shell::SetMouseCursor(const Rml::Core::String& cursor_name)
 	// Not implemented
 	// Not implemented
 }
 }
 
 
-void Shell::SetClipboardText(const Rml::Core::WString& text)
+void Shell::SetClipboardText(const Rml::Core::String& text)
 {
 {
 	// Todo: interface with system clipboard
 	// Todo: interface with system clipboard
 	clipboard_text = text;
 	clipboard_text = text;
 }
 }
 
 
-void Shell::GetClipboardText(Rml::Core::WString& text)
+void Shell::GetClipboardText(Rml::Core::String& text)
 {
 {
 	// Todo: interface with system clipboard
 	// Todo: interface with system clipboard
 	text = clipboard_text;
 	text = clipboard_text;

+ 0 - 1
Source/Core/FontEngineDefault/FontFaceHandleDefault.cpp

@@ -32,7 +32,6 @@
 #include "FontProvider.h"
 #include "FontProvider.h"
 #include "FontFaceLayer.h"
 #include "FontFaceLayer.h"
 #include "FreeTypeInterface.h"
 #include "FreeTypeInterface.h"
-#include <algorithm>
 
 
 namespace Rml {
 namespace Rml {
 namespace Core {
 namespace Core {

+ 0 - 13
Source/Core/StringUtilities.cpp

@@ -1,16 +1,3 @@
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
-#include "..\..\Include\RmlUi\Core\StringUtilities.h"
 /*
 /*
  * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  * This source file is part of RmlUi, the HTML/CSS Interface Middleware
  *
  *