Merge branch 'master' into memory_editor

src/ImGui.NET/ImGui.cs

@@ -93,9 +93,12 @@ namespace ImGuiNET
             ImGuiNative.igTextWrapped(text);
         }
 
-        public static void TextUnformatted(string message)
+        public static unsafe void TextUnformatted(string message)
         {
-            ImGuiNative.igTextUnformatted(message, null);
+            fixed (byte* bytes = System.Text.Encoding.UTF8.GetBytes(message))
+            {
+                ImGuiNative.igTextUnformatted(bytes, null);
+            }
         }
 
         public static void LabelText(string label, string text)
@@ -942,11 +945,6 @@ namespace ImGuiNET
             ImGuiNative.igOpenPopup(id);
         }
 
-        public static void SameLine()
-        {
-            ImGuiNative.igSameLine(0, 0);
-        }
-
         public static void SameLine(float localPositionX = 0, float spacingW = -1.0f)
         {
             ImGuiNative.igSameLine(localPositionX, spacingW);

src/ImGui.NET/ImGuiNative.cs

@@ -272,7 +272,7 @@ namespace ImGuiNET
         public static extern void igTextWrapped(string fmt);
 
         [DllImport(cimguiLib)]
-        public static extern void igTextUnformatted(string text, string text_end);
+        public static extern void igTextUnformatted(byte* text, byte* text_end);
 
         [DllImport(cimguiLib)]
         public static extern void igLabelText(string label, string fmt);