修正CPF

CPF/Charts/Chart.cs

@@ -64,9 +64,9 @@ namespace CPF.Charts
         Panel tipPanel;
         TextBlock tipName;
         Panel tipListPanel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             seriesPanel = FindPresenterByName<Panel>("seriesPanel");
             tipPanel = FindPresenterByName<Panel>("tipPanel");
             tipName = FindPresenterByName<TextBlock>("tipName");

CPF/Charts/PieChart.cs

@@ -269,9 +269,9 @@ namespace CPF.Charts
         Panel tipPanel;
         TextBlock tipName;
         Panel tipListPanel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             seriesPanel = FindPresenterByName<Panel>("seriesPanel");
             tipPanel = FindPresenterByName<Panel>("tipPanel");
             tipName = FindPresenterByName<TextBlock>("tipName");

CPF/Controls/Calendar.cs

@@ -74,9 +74,9 @@ namespace CPF.Controls
         Grid Month;
         Grid Year;
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             Month = FindPresenterByName<Grid>("MonthView");
             Year = FindPresenterByName<Grid>("YearView");
             var date = DisplayDate.Date;

CPF/Controls/CodeTextBox/CodeTextBox.cs

@@ -357,9 +357,9 @@ namespace CPF.Controls
 
         ScrollViewer scrollViewer;
         LineNumber lineNumber;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             scrollViewer = FindPresenterByName<ScrollViewer>("scrollViewer");
             lineNumber = FindPresenterByName<LineNumber>("lineNumber");
             var contentPresenter = scrollViewer.FindPresenterByName<Border>("contentPresenter");

CPF/Controls/ComboBox.cs

@@ -362,9 +362,9 @@ namespace CPF.Controls
         //    return panel;
         //}
         //Panel panel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             //panel = GetItemsPanel();
             //if (panel == null)
             //{

CPF/Controls/ContentControl.cs

@@ -163,7 +163,7 @@ namespace CPF.Controls
             });
         }
         UIElement contentPresenter;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             contentPresenter = FindPresenterByName<UIElement>("contentPresenter");
             if (contentPresenter == null)
@@ -192,7 +192,7 @@ namespace CPF.Controls
                     }
                 }
             }
-            base.OnInitializedAsync();
+            base.OnInitialized();
         }
 
         protected override void OnOverrideMetadata(OverrideMetadata overridePropertys)

CPF/Controls/Control.cs

@@ -281,12 +281,12 @@ namespace CPF.Controls
                     Template(this, this.Children);
                 }
                 IsInitialized = true;
-                OnInitializedAsync();
+                OnInitialized();
             }
             LoadStyle();
         }
 
-        protected virtual void OnInitializedAsync()
+        protected virtual void OnInitialized()
         {
             if (triggers != null)
             {

CPF/Controls/DataGrid/DataGrid.cs

@@ -202,7 +202,7 @@ namespace CPF.Controls
         }
         internal DataGridScrollViewer viewer;
         VirtualizationPresenter<DataGridRow> presenter;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             viewer = FindPresenter<DataGridScrollViewer>().FirstOrDefault(a => a.Name == "DG_ScrollViewer");
             if (!viewer)
@@ -254,7 +254,7 @@ namespace CPF.Controls
             }
             columns.CollectionChanged += Columns_CollectionChanged;
             viewer.contentPresenter.LayoutUpdated += ContentPresenter_LayoutUpdated;
-            base.OnInitializedAsync();
+            base.OnInitialized();
             var panel = ItemsHost as StackPanel;
             if (!panel || panel.Orientation == Orientation.Horizontal)
             {

CPF/Controls/DataGrid/DataGridCell.cs

@@ -85,9 +85,9 @@ namespace CPF.Controls
             Triggers.Add(nameof(IsSelected), Relation.Me, null, (nameof(Background), "75,178,255"));
         }
         DataGridCellTemplate cellTemplate;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             cellTemplate = FindPresenter<DataGridCellTemplate>().FirstOrDefault(a => a.Name == "CellTemplate");
         }
 

CPF/Controls/DataGrid/DataGridRow.cs

@@ -59,7 +59,7 @@ namespace CPF.Controls
             Triggers.Add(new Styling.Trigger { Property = nameof(IsSelected), Setters = { { nameof(Background), "#ddd" } } });
         }
         internal Panel itemsPanel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             itemsPanel = FindPresenter<Panel>().FirstOrDefault(a => a.Name == "itemsPanel");
             if (!itemsPanel)
@@ -74,7 +74,7 @@ namespace CPF.Controls
                 }
             }
 
-            base.OnInitializedAsync();
+            base.OnInitialized();
         }
 
         [PropertyChanged(nameof(IsSelected))]

CPF/Controls/DataGrid/DataGridScrollViewer.cs

@@ -47,14 +47,14 @@ namespace CPF.Controls
 
         internal Panel PART_ColumnHeadersPresenter;
         internal UIElement contentPresenter;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             PART_ColumnHeadersPresenter = FindPresenter<Panel>().FirstOrDefault(a => a.Name == "PART_ColumnHeadersPresenter");
             if (!PART_ColumnHeadersPresenter)
             {
                 throw new Exception("需要Name为PART_ColumnHeadersPresenter的元素");
             }
-            base.OnInitializedAsync();
+            base.OnInitialized();
             contentPresenter = FindPresenter().FirstOrDefault(a => a.Name == "contentPresenter");
         }
 

CPF/Controls/ItemsControl.cs

@@ -271,9 +271,9 @@ namespace CPF.Controls
             return FindPresenter<Panel>().FirstOrDefault(a => a.Name == "itemsPanel");
         }
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             panel = GetItemsPanel();
             //if (panel == null)
             //{

CPF/Controls/ListBox.cs

@@ -179,9 +179,9 @@ namespace CPF.Controls
 
         VirtualizationPresenter<ListBoxItem> presenter;
         //Panel InnerPanel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             if (isVirtualizing)
             {
                 presenter = FindPresenter<VirtualizationPresenter<ListBoxItem>>().FirstOrDefault();

CPF/Controls/MenuItem.cs

@@ -322,9 +322,9 @@ namespace CPF.Controls
             this.Triggers.Add(new Styling.Trigger { Property = nameof(IsMouseOver), Setters = { { nameof(Background), "#fff" } } });
         }
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
 
         }
 

CPF/Controls/MultiSelector.cs

@@ -331,10 +331,10 @@ namespace CPF.Controls
         }
 
         bool isFirst;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             isFirst = true;
-            base.OnInitializedAsync();
+            base.OnInitialized();
             isFirst = false;
             if (selectIndex.HasValue)
             {

CPF/Controls/NumericUpDown.cs

@@ -107,9 +107,9 @@ namespace CPF.Controls
             });
         }
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             numTextBox = FindPresenterByName<TextBox>("numTextBox");
         }
         TextBox numTextBox;

CPF/Controls/PageManger.cs

@@ -138,9 +138,9 @@ namespace CPF.Controls
         }
 
 #if !DesignMode //用户代码写到这里，设计器下不执行，防止设计器出错
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
 
         }
         //用户代码

CPF/Controls/ProgressBar.cs

@@ -97,9 +97,9 @@ namespace CPF.Controls
             });
         }
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             _indicator = FindPresenter().FirstOrDefault(a => a.Name == "Indicator");
             _Animation = FindPresenter().FirstOrDefault(a => a.Name == "Animation");
         }

CPF/Controls/Slider.cs

@@ -197,9 +197,9 @@ namespace CPF.Controls
             });
         }
 
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             this.Track = FindPresenter<Track>().FirstOrDefault(a => a.Name == "PART_Track");
         }
 

CPF/Controls/TabControl.cs

@@ -363,7 +363,7 @@ namespace CPF.Controls
 
         Panel headerPanel;
         Panel contentPanel;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
             headerPanel = FindPresenter<Panel>().FirstOrDefault(a => a.Name == "headerPanel");
             if (!headerPanel)
@@ -410,7 +410,7 @@ namespace CPF.Controls
                 }
                 //}
             }
-            base.OnInitializedAsync();
+            base.OnInitialized();
         }
         [PropertyChanged(nameof(SelectedIndex))]
         void RegisterSelectedIndex(object newValue, object oldValue, PropertyMetadataAttribute attribute)

CPF/Controls/TextBox.cs

@@ -420,9 +420,9 @@ namespace CPF.Controls
         }
 
         ScrollViewer scrollViewer;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             if (view == null)
             {
                 view = TextBoxView;

CPF/Controls/View.cs

@@ -1795,9 +1795,9 @@ namespace CPF.Controls
 
         //}
         internal List<(Delegate, UIElement)> afterStyles;
-        protected override void OnInitializedAsync()
+        protected override void OnInitialized()
         {
-            base.OnInitializedAsync();
+            base.OnInitialized();
             if (afterStyles != null)
             {
                 foreach (var item in afterStyles)