개정판 a6f7f9b6
issue #1136: control 생성자에서 generic.xaml 제거 및 App.xaml 에 generic 추가
Change-Id: Ife79570df09c37a10104924afbd0caebc03f1244
| MarkupToPDF/Controls/Etc/SymControl.cs | ||
|---|---|---|
| 35 | 35 |
{
|
| 36 | 36 |
DefaultStyleKeyProperty.OverrideMetadata(typeof(SymControl), new FrameworkPropertyMetadata(typeof(SymControl))); |
| 37 | 37 |
//Application.Current.Resources.MergedDictionaries.Add(Application.LoadComponent(new Uri("/MarkupToPDF;Component/Themes/generic.xaml")) as ResourceDictionary);
|
| 38 |
ResourceDictionary dictionary = new ResourceDictionary(); |
|
| 39 |
dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 40 |
Application.Current.Resources.MergedDictionaries.Add(dictionary); |
|
| 41 |
System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 38 |
//ResourceDictionary dictionary = new ResourceDictionary();
|
|
| 39 |
//dictionary.Source = new Uri("/MarkupToPDF;component/themes/generic.xaml", UriKind.RelativeOrAbsolute);
|
|
| 40 |
//Application.Current.Resources.MergedDictionaries.Add(dictionary);
|
|
| 41 |
//System.Diagnostics.Debug.WriteLine("resource Count :" + Application.Current.Resources.MergedDictionaries.Count);
|
|
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 | 44 |
public void Dispose() |
| 45 | 45 |
{
|
| 46 |
GC.Collect(); |
|
| 47 |
GC.SuppressFinalize(this); |
|
| 46 |
//GC.Collect(); |
|
| 47 |
//GC.SuppressFinalize(this); |
|
| 48 |
this.Base_SymPath = null; |
|
| 49 |
this.Base_ViewBox = null; |
|
| 48 | 50 |
} |
| 49 | 51 |
public event PropertyChangedEventHandler PropertyChanged; |
| 50 | 52 |
protected void RaisePropertyChanged(string propName) |
내보내기 Unified diff
