Fix name conflict.

Berrysoft · Dec 23, 2019 · faf35ee · faf35ee
1 parent 5d48327
commit faf35ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/WebWindow.Native/WebWindow.Mac.AppDelegate.mm b/src/WebWindow.Native/WebWindow.Mac.AppDelegate.mm
@@ -2,7 +2,7 @@
 #include "WebWindow.h"
 #include <map>
 
-extern map<NSWindow*, WebWindow*> nsWindowToWebWindow;
+extern std::map<NSWindow*, WebWindow*> nsWindowToWebWindow;
 
 @implementation MyApplicationDelegate : NSObject
 - (id)init {
@@ -19,7 +19,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
 
 - (void)windowDidResize:(NSNotification *)notification {
     NSWindow *window = notification.object;
-    WebWindow* webWindow = nsWindowToWebWindow[hwnd];
+    WebWindow* webWindow = nsWindowToWebWindow[window];
     if (webWindow)
     {
         int width, height;
@@ -30,7 +30,7 @@ - (void)windowDidResize:(NSNotification *)notification {
 
 - (void)windowDidMove:(NSNotification *)notification {
     NSWindow *window = notification.object;
-    WebWindow* webWindow = nsWindowToWebWindow[hwnd];
+    WebWindow* webWindow = nsWindowToWebWindow[window];
     if (webWindow)
     {
         int x, y;

diff --git a/src/WebWindow.Native/WebWindow.h b/src/WebWindow.Native/WebWindow.h
@@ -16,16 +16,13 @@ typedef const wchar_t* AutoString;
 typedef char* AutoString;
 #endif
 
-struct Rect
-{
-	int x, y;
-	int width, height;
-};
-
 struct Monitor
 {
-	Rect monitor;
-	Rect work;
+	struct MonitorRect
+	{
+		int x, y;
+		int width, height;
+	} monitor, work;
 };
 
 typedef void (*ACTION)();