diff --git a/Sources/ImGuiSwift/ImGuiBase.swift b/Sources/ImGuiSwift/ImGuiBase.swift index bd0d65d..c838a7a 100644 --- a/Sources/ImGuiSwift/ImGuiBase.swift +++ b/Sources/ImGuiSwift/ImGuiBase.swift @@ -41,7 +41,7 @@ public class ImGuiBase { } public func setup() { - io = imguiWrapper.getIO() as! ImGuiIOBridge + io = imguiWrapper.getIO() as? ImGuiIOBridge #if os(iOS) input = InputTextButton() diff --git a/Sources/ImGuiSwift/ImGuiEnums.swift b/Sources/ImGuiSwift/ImGuiEnums.swift index bf737ab..4cec446 100644 --- a/Sources/ImGuiSwift/ImGuiEnums.swift +++ b/Sources/ImGuiSwift/ImGuiEnums.swift @@ -27,7 +27,7 @@ public struct ImGuiWindowFlags: OptionSet { public let rawValue: Int32 - public init(rawValue: ImGuiWindowFlags.RawValue) { + public init(rawValue: Int32) { self.rawValue = rawValue } @@ -63,7 +63,7 @@ public struct ImGuiSelectableFlags: OptionSet { public let rawValue: Int32 - public init(rawValue: ImGuiSelectableFlags.RawValue) { + public init(rawValue: Int32) { self.rawValue = rawValue } @@ -76,7 +76,7 @@ public struct ImGuiInputTextFlags: OptionSet { public let rawValue: Int32 - public init(rawValue: ImGuiInputTextFlags.RawValue) { + public init(rawValue: Int32) { self.rawValue = rawValue } @@ -106,7 +106,7 @@ public struct ImGuiSetCond: OptionSet public let rawValue: Int32 - public init(rawValue: ImGuiSetCond.RawValue) { + public init(rawValue: Int32) { self.rawValue = rawValue } diff --git a/Sources/ImGuiSwift/Metal/ImGuiMetal.swift b/Sources/ImGuiSwift/Metal/ImGuiMetal.swift index 223a343..65180b5 100644 --- a/Sources/ImGuiSwift/Metal/ImGuiMetal.swift +++ b/Sources/ImGuiSwift/Metal/ImGuiMetal.swift @@ -97,7 +97,7 @@ public class ImGuiMetal: ImGuiBase { if let imguiWrapper = imguiWrapper as? ImGuiWrapperMetal { imguiWrapper.newFrame(with: commandEncoder) } - io = imguiWrapper.getIO() as! ImGuiIOBridge + io = imguiWrapper.getIO() as? ImGuiIOBridge #if os(iOS) DispatchQueue.main.async { self.input.draw(imgui: self) @@ -109,7 +109,7 @@ public class ImGuiMetal: ImGuiBase { if let imguiWrapper = imguiWrapper as? ImGuiWrapperMetal { imguiWrapper.newFrame(drawable) } - io = imguiWrapper.getIO() as! ImGuiIOBridge + io = imguiWrapper.getIO() as? ImGuiIOBridge #if os(iOS) input.draw(imgui: self) #endif diff --git a/Sources/usynergy/uSynergy.h b/Sources/usynergy/uSynergy.h index cedc387..eb9b396 100644 --- a/Sources/usynergy/uSynergy.h +++ b/Sources/usynergy/uSynergy.h @@ -204,7 +204,7 @@ have occured. The time base should be a cyclic millisecond time value. @returns Time value in milliseconds **/ -typedef uint32_t (*uSynergyGetTimeFunc)(); +typedef uint32_t (*uSynergyGetTimeFunc)(void); diff --git a/Swift-ImGui.xcodeproj/project.pbxproj b/Swift-ImGui.xcodeproj/project.pbxproj index f22743e..ca5982e 100644 --- a/Swift-ImGui.xcodeproj/project.pbxproj +++ b/Swift-ImGui.xcodeproj/project.pbxproj @@ -669,7 +669,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1000; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Hiroaki Yamane"; TargetAttributes = { 994920B0211263B700D206BB = { @@ -709,7 +709,7 @@ }; buildConfigurationList = 999ECC271EC6B0F6009C3E39 /* Build configuration list for PBXProject "Swift-ImGui" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, diff --git a/Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-iOS.xcscheme b/Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-iOS.xcscheme index df15801..c09c8f5 100644 --- a/Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-iOS.xcscheme +++ b/Swift-ImGui.xcodeproj/xcshareddata/xcschemes/Swift-ImGui-iOS.xcscheme @@ -1,6 +1,6 @@