Skip to content

Commit bcc7db1

Browse files
author
denfromufa
committed
Update DynamicGrid.py
removed ironpython reference.
1 parent b0de94e commit bcc7db1

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

demo/DynamicGrid.py

+11-25
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,22 @@
22
import sys
33
if sys.platform.lower() not in ['cli','win32']:
44
print("only windows is supported for wpf")
5-
try:
6-
ironpy = sys.implementation.name.lower() == "ironpython"
7-
except:
8-
ironpy = False
9-
if ironpy:
10-
import wpf
11-
else:
12-
clr.AddReference(r"wpf\PresentationFramework")
13-
from System.IO import StreamReader
14-
from System.Windows.Markup import XamlReader
15-
from System.Threading import Thread, ThreadStart, ApartmentState
16-
5+
clr.AddReference(r"wpf\PresentationFramework")
6+
from System.IO import StreamReader
7+
from System.Windows.Markup import XamlReader
8+
from System.Threading import Thread, ThreadStart, ApartmentState
179
from System.Windows import Application, Window
1810

1911

2012
class MyWindow(Window):
2113
def __init__(self):
22-
if ironpy:
23-
wpf.LoadComponent(self, "DynamicGrid.xaml")
24-
else:
25-
stream = StreamReader("DynamicGrid.xaml")
26-
window = XamlReader.Load(stream.BaseStream)
27-
Application().Run(window)
14+
stream = StreamReader("DynamicGrid.xaml")
15+
window = XamlReader.Load(stream.BaseStream)
16+
Application().Run(window)
2817

2918

3019
if __name__ == '__main__':
31-
if ironpy:
32-
Application().Run(MyWindow())
33-
else:
34-
thread = Thread(ThreadStart(MyWindow))
35-
thread.SetApartmentState(ApartmentState.STA)
36-
thread.Start()
37-
thread.Join()
20+
thread = Thread(ThreadStart(MyWindow))
21+
thread.SetApartmentState(ApartmentState.STA)
22+
thread.Start()
23+
thread.Join()

0 commit comments

Comments
 (0)