개정판 a6f7f9b6
issue #1136: control 생성자에서 generic.xaml 제거 및 App.xaml 에 generic 추가
Change-Id: Ife79570df09c37a10104924afbd0caebc03f1244
| MarkupToPDF/Controls/Cad/ClipWhiteControlcs.cs | ||
|---|---|---|
| 509 | 509 |
static ClipWhiteControl() |
| 510 | 510 |
{
|
| 511 | 511 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(ClipWhiteControl), new FrameworkPropertyMetadata(typeof(ClipWhiteControl))); |
| 512 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 513 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 512 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 513 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 514 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 515 | 515 |
} |
| 516 | 516 |
|
| 517 | 517 |
|
| ... | ... | |
| 659 | 659 |
|
| 660 | 660 |
public void Dispose() |
| 661 | 661 |
{
|
| 662 |
GC.Collect(); |
|
| 663 |
GC.SuppressFinalize(this); |
|
| 662 |
//GC.Collect(); |
|
| 663 |
//GC.SuppressFinalize(this); |
|
| 664 |
this.Base_RectPath = null; |
|
| 664 | 665 |
} |
| 665 | 666 |
#endregion Internal Method |
| 666 | 667 |
} |
내보내기 Unified diff
