Update ImGui to v1.85

CHANGE

@@ -0,0 +1 @@
+Change `cuchar` to `uint8`, since Nim 1.5 marks it as deprecated

src/imgui/impl_glfw.nim

@@ -8,6 +8,9 @@
 
 import ../imgui, nimgl/glfw
 
+when defined(windows):
+  import nimgl/glfw/native
+
 type
   GlfwClientApi = enum
     igGlfwClientApiUnkown
@@ -115,8 +118,8 @@ proc igGlfwInit(window: GLFWwindow, installCallbacks: bool, clientApi: GlfwClien
     io.setClipboardTextFn = igGlfwSetClipboardText
     io.getClipboardTextFn = igGlfwGetClipboardText
   io.clipboardUserData = gWindow
-  # when defined windows:
-  #   io.imeWindowHandle = gWindow.getWin32Window()
+  when defined windows:
+    io.imeWindowHandle = gWindow.getWin32Window()
 
   gMouseCursors[ImGuiMouseCursor.Arrow.int32] = glfwCreateStandardCursor(GLFWArrowCursor)
   gMouseCursors[ImGuiMouseCursor.TextInput.int32] = glfwCreateStandardCursor(GLFWIbeamCursor)

src/imgui/impl_opengl.nim

@@ -60,7 +60,7 @@ proc igOpenGL3CheckShader(handle: uint32, desc: string) =
 
 proc igOpenGL3CreateFontsTexture() =
   let io = igGetIO()
-  var text_pixels: ptr cuchar
+  var text_pixels: ptr uint8
   var text_w: int32
   var text_h: int32
   io.fonts.getTexDataAsRGBA32(text_pixels.addr, text_w.addr, text_h.addr)

tests/tnull.nim

@@ -11,7 +11,7 @@ echo "CreateContext() - {version}".fmt
 igCreateContext(nil)
 let io = igGetIO()
 
-var text_pixels: ptr cuchar = nil
+var text_pixels: ptr uint8 = nil
 var text_w: int32
 var text_h: int32
 io.fonts.getTexDataAsRGBA32(text_pixels.addr, text_w.addr, text_h.addr, nil)

tools/generator.nim

@@ -88,7 +88,7 @@ proc translateType(name: string): string =
   result = result.replace("_Simple", "")
   if result.contains("char") and not result.contains("Wchar"):
     if result.contains("uchar"):
-      result = "cuchar"
+      result = "uint8"
     elif depth > 0:
       result = result.replace("char", "cstring")
       depth.dec
@@ -313,7 +313,7 @@ proc genProcs(output: var string) =
               argDefault.add("{letters[p]}: {argPices[p]}, ".fmt)
             argDefault = argDefault[0 ..< argDefault.len - 2] & ")"
 
-          if (argType.startsWith("ImGui") or argType.startsWith("Im")) and not argType.contains("Callback"):
+          if (argType.startsWith("ImGui") or argType.startsWith("Im")) and not argType.contains("Callback") and not argType.contains("ImVec"): # Ugly hack, should fix later
             argDefault.add(".{argType}".fmt)
 
         if argName.startsWith("_"):
@@ -375,7 +375,7 @@ proc genProcs(output: var string) =
       if outSplit[1] == outSplit[2] or outSplit[1].split('{')[0] == outSplit[2].split('{')[0]:
         output = "{outSplit[0]}\n{outSplit[1]}\n".fmt
 
-  output.add("\n{.pop.}\n")
+  output.add("\n{postProcs}\n".fmt)
 
 proc igGenerate*() =
   var output = srcHeader

tools/utils.nim

@@ -91,12 +91,18 @@ const notDefinedStructs* = """
 
 const preProcs* = """
 # Procs
+{.push warning[HoleEnumConv]: off.}
 when not defined(cpp) or defined(cimguiDLL):
   {.push dynlib: imgui_dll, cdecl, discardable.}
 else:
   {.push nodecl, discardable.}
 """
 
+const postProcs* = """
+{.pop.} # push dynlib / nodecl, etc...
+{.pop.} # push warning[HoleEnumConv]: off
+"""
+
 let reservedWordsDictionary* = [
 "end", "type", "out", "in", "ptr", "ref"
 ]