Commite85a255

committed

Merge pull requestpythonnet#198 from tonyroberts/develop

Start the wordpad demo in an STA thread.

2 parents53bd058 +9f562be commite85a255Copy full SHA for e85a255

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`importclr`
`11`	`11`	`importSystem.Windows.FormsasWinForms`
	`12`	`+fromSystem.ThreadingimportThread,ThreadStart,ApartmentState`
`12`	`13`	`fromSystem.DrawingimportColor,Size,Point`
`13`	`14`	`fromSystem.TextimportEncoding`
`14`	`15`	`fromSystem.IOimportFile`
`@@ -420,12 +421,19 @@ def OnClickClose(self, sender, args):`
`420`	`421`	`self.Close()`
`421`	`422`
`422`	`423`
`423`		`-`
`424`		`-defmain():`
	`424`	`+defapp_thread():`
`425`	`425`	`app=Wordpad()`
`426`	`426`	`WinForms.Application.Run(app)`
`427`	`427`	`app.Dispose()`
`428`	`428`
	`429`	`+`
	`430`	`+defmain():`
	`431`	`+thread=Thread(ThreadStart(app_thread))`
	`432`	`+thread.SetApartmentState(ApartmentState.STA)`
	`433`	`+thread.Start()`
	`434`	`+thread.Join()`
	`435`	`+`
	`436`	`+`
`429`	`437`	`if__name__=='__main__':`
`430`	`438`	`main()`
`431`	`439`

Comments

(0)