Mercurial > hg > toolkit / file diff

--- a/ui/winui/toolkit.cpp	Fri Oct 06 19:38:10 2023 +0200
+++ b/ui/winui/toolkit.cpp	Tue Oct 10 10:58:14 2023 +0200
@@ -26,22 +26,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "toolkit.h"
+#include "pch.h"
 
-#include <Windows.h>
-#undef GetCurrentTime
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.UI.Xaml.Interop.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
-#include <winrt/Microsoft.UI.Xaml.Markup.h>
+#include "toolkit.h"
 
 #include <cx/allocator.h>
 #include <cx/mempool.h>
 
 #include "../common/context.h"
+#include "../common/toolbar.h"
 
+#include "MainWindow.xaml.h"
+
+#include "App.xaml.h"
 
 using namespace winrt;
 using namespace Microsoft::UI::Xaml;
@@ -77,6 +74,9 @@
 		if (startup_func) {
 			startup_func(NULL, startup_data);
 		}
+
+		//auto window = make<winui::implementation::MainWindow>();
+		//window.Activate();
 	}
 	IXamlType GetXamlType(TypeName const& type) {
 		return provider.GetXamlType(type);
@@ -126,6 +126,8 @@
 
 void ui_init(const char* appname, int argc, char** argv) {
 	application_name = appname;
+
+	uic_toolbar_init();
 }
 
 const char* ui_appname() {