From 5c2aba8c328b0d753cdce68a1b7e94f0adf8fba3 Mon Sep 17 00:00:00 2001 From: nixinwang Date: Thu, 14 Mar 2024 08:31:49 -0700 Subject: [PATCH 1/4] Update dlg.m --- cocoa/dlg.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocoa/dlg.m b/cocoa/dlg.m index 2b31dc9..1ea803b 100644 --- a/cocoa/dlg.m +++ b/cocoa/dlg.m @@ -106,7 +106,7 @@ - (NSInteger)runPanel:(NSSavePanel*)panel { [panel setTitle:[[NSString alloc] initWithUTF8String:self->params->title]]; } if(self->params->numext > 0) { - [panel setAllowedFileTypes:[NSArray arrayWithObjects:(NSString**)self->params->exts count:self->params->numext]]; + // [panel setAllowedFileTypes:[NSArray arrayWithObjects:(NSString**)self->params->exts count:self->params->numext]]; } if(self->params->relaxext) { [panel setAllowsOtherFileTypes:YES]; @@ -149,4 +149,4 @@ - (DlgResult)load { return DLG_OK; } -@end \ No newline at end of file +@end From cb5dc67ee7f7181494cc934aa811807b9dd0d244 Mon Sep 17 00:00:00 2001 From: nixinwang Date: Thu, 14 Mar 2024 08:49:40 -0700 Subject: [PATCH 2/4] setAllowedFileTypes is deprecated in macOS 12.0, use setAllowedContentTypes instead --- cocoa/dlg.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocoa/dlg.m b/cocoa/dlg.m index 1ea803b..8530931 100644 --- a/cocoa/dlg.m +++ b/cocoa/dlg.m @@ -106,7 +106,7 @@ - (NSInteger)runPanel:(NSSavePanel*)panel { [panel setTitle:[[NSString alloc] initWithUTF8String:self->params->title]]; } if(self->params->numext > 0) { - // [panel setAllowedFileTypes:[NSArray arrayWithObjects:(NSString**)self->params->exts count:self->params->numext]]; + [panel setAllowedContentTypes:[NSArray arrayWithObjects:(NSString**)self->params->exts count:self->params->numext]]; } if(self->params->relaxext) { [panel setAllowsOtherFileTypes:YES]; From 0aadc36a26c7f96a8da034f9c022f4f7f583e725 Mon Sep 17 00:00:00 2001 From: nixinwang Date: Thu, 14 Mar 2024 08:56:05 -0700 Subject: [PATCH 3/4] clean up last empty line From b4bad92eff4d98d45848709109a9dd0322d75407 Mon Sep 17 00:00:00 2001 From: wwbbx Date: Thu, 23 May 2024 19:33:14 -0700 Subject: [PATCH 4/4] updated to use my fork --- dlgs_darwin.go | 2 +- example/simple/main.go | 2 +- example/wde/main.go | 2 +- go.mod | 15 +++++++++++++-- go.sum | 16 ++++++++++++++-- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlgs_darwin.go b/dlgs_darwin.go index 7185c51..38e49aa 100644 --- a/dlgs_darwin.go +++ b/dlgs_darwin.go @@ -1,7 +1,7 @@ package dialog import ( - "github.com/sqweek/dialog/cocoa" + "github.com/nixinwang/dialog/cocoa" ) func (b *MsgBuilder) yesNo() bool { diff --git a/example/simple/main.go b/example/simple/main.go index 4277e6c..f32c0e2 100644 --- a/example/simple/main.go +++ b/example/simple/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/sqweek/dialog" + "github.com/nixinwang/dialog" ) func main() { diff --git a/example/wde/main.go b/example/wde/main.go index c2e2417..4a84539 100644 --- a/example/wde/main.go +++ b/example/wde/main.go @@ -6,9 +6,9 @@ import ( "image/color" "image/draw" + "github.com/nixinwang/dialog" "github.com/skelterjohn/go.wde" // nolint: goimports _ "github.com/skelterjohn/go.wde/init" - "github.com/sqweek/dialog" ) var loadR, saveR image.Rectangle diff --git a/go.mod b/go.mod index ffa1366..e5c9813 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,16 @@ -module github.com/sqweek/dialog +module github.com/nixinwang/dialog + +go 1.22.0 + +require ( + github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d + github.com/skelterjohn/go.wde v0.0.0-20190318181201-adc3f78cdb45 +) require ( - github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf + github.com/AllenDang/w32 v0.0.0-20180428130237-ad0a36d80adc // indirect + github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect + github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect + github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc // indirect + github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 // indirect ) diff --git a/go.sum b/go.sum index 842aef2..e14ba1a 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,14 @@ -github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2jiKyS17BH6IrTmUBYqZa/CXT4uvb+I= -github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I= +github.com/AllenDang/w32 v0.0.0-20180428130237-ad0a36d80adc h1:w3fW4b1hPf6/cfdQQ/vu9V8eBeQmuLZIaUMj81nIzYQ= +github.com/AllenDang/w32 v0.0.0-20180428130237-ad0a36d80adc/go.mod h1:1rHKulT5eD2DzdKxDXUZRKtBfkTzLmTL42ZmEmOfyrs= +github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJXZHsaM8b6OLVo6muQUQd4CwkH/D3fnnbHXA= +github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ= +github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g= +github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966/go.mod h1:Mid70uvE93zn9wgF92A/r5ixgnvX8Lh68fxp9KQBaI0= +github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk= +github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046 h1:O/r2Sj+8QcMF7V5IcmiE2sMFV2q3J47BEirxbXJAdzA= +github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046/go.mod h1:uw9h2sd4WWHOPdJ13MQpwK5qYWKYDumDqxWWIknEQ+k= +github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d h1:2xp1BQbqcDDaikHnASWpVZRjibOxu7y9LhAv04whugI= +github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I= +github.com/skelterjohn/go.wde v0.0.0-20190318181201-adc3f78cdb45 h1:+iBDFztSlypenVQoWsHMmhfn6PWICRvB14LpQFozfS0= +github.com/skelterjohn/go.wde v0.0.0-20190318181201-adc3f78cdb45/go.mod h1:zXxNsJHeUYIqpg890APBNEn9GoCbA4Cdnvuv3mx4fBk=