summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrustable-code <krauter.simon@arcor.de>2019-11-08 15:44:56 +0100
committertrustable-code <krauter.simon@arcor.de>2019-11-08 15:44:56 +0100
commit23e692eef7338e948ce6a293a76983aa389c2ed4 (patch)
tree6c60b87daca88cafbc8b3a2c2f85d43c753dc9c4
parent88f7c870c23e24ebe7b958892552906e6f26cd09 (diff)
downloadNiGui-23e692eef7338e948ce6a293a76983aa389c2ed4.tar.gz
NiGui-23e692eef7338e948ce6a293a76983aa389c2ed4.zip
Cleanup code
-rwxr-xr-xsrc/nigui/private/windows/platform_impl.nim5
-rwxr-xr-xsrc/nigui/private/windows/windows.nim3
2 files changed, 2 insertions, 6 deletions
diff --git a/src/nigui/private/windows/platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index 05b0f8b..ef61b89 100755
--- a/src/nigui/private/windows/platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
@@ -156,11 +156,8 @@ proc pEnableVisualStyles() =
actCtx.lpSource = "shell32.dll"
actCtx.lpAssemblyDirectory = dir
actCtx.lpResourceName = cast[cstring](124)
- var context = CreateActCtxA(actCtx.addr)
+ var context = CreateActCtxA(actCtx)
if context == INVALID_HANDLE_VALUE: pRaiseLastOSError()
- # has no effect:
- # var ulpActivationCookie = false
- # if not ActivateActCtx(context, ulpActivationCookie.addr): pRaiseLastOSError()
proc pRegisterWindowClass(className: string, wndProc: pointer, style: int32 = 0) =
var class: WndClassEx
diff --git a/src/nigui/private/windows/windows.nim b/src/nigui/private/windows/windows.nim
index a9b275d..bd55257 100755
--- a/src/nigui/private/windows/windows.nim
+++ b/src/nigui/private/windows/windows.nim
@@ -383,8 +383,7 @@ proc hiWord*(param: pointer): int =
proc LoadLibraryA*(lpFileName: cstring): pointer {.importc: "LoadLibraryA", libKernel32.}
# proc GetModuleHandleA*(lpModuleName: cstring): pointer {.importc: "GetModuleHandleA", libKernel32.}
proc GetLastError*(): int {.importc: "GetLastError", libKernel32.}
-proc CreateActCtxA*(pActCtx: pointer): pointer {.importc: "CreateActCtxA", libKernel32.}
-proc ActivateActCtx*(pActCtx, lpCookie: pointer): bool {.importc: "ActivateActCtx", libKernel32.}
+proc CreateActCtxA*(pActCtx: var ActCtx): pointer {.importc: "CreateActCtxA", libKernel32.}
proc GetSystemDirectoryA*(lpBuffer: pointer, uSize: int32): int32 {.importc: "GetSystemDirectoryA", libKernel32.}
proc MultiByteToWideChar*(CodePage, dwFlags: int32, lpMultiByteStr: cstring, cbMultiByte: int32, lpWideCharStr: cstring, cchWideChar: int32): int32 {.importc: "MultiByteToWideChar", libKernel32.}
proc WideCharToMultiByte*(CodePage, dwFlags: int32, lpWideCharStr: cstring, cchWideChar: int32, lpMultiByteStr: cstring, cbMultiByte: int32, lpDefaultChar: cstring, lpUsedDefaultChar: pointer): int32 {.importc: "WideCharToMultiByte", libKernel32.}