Move include statements above extern "C" in C headers

Use __bridge casts for NSMenu and NSMenuItem in macOS menu code

Author: lijy91

src/capi/app_runner_c.h

@@ -9,12 +9,12 @@
 #define FFI_PLUGIN_EXPORT
 #endif
 
+#include "window_c.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "window_c.h"
-
 /**
  * App runner exit codes
  */

src/capi/window_c.h

@@ -9,12 +9,12 @@
 #define FFI_PLUGIN_EXPORT
 #endif
 
+#include "geometry_c.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "geometry_c.h"
-
 /**
  * Window ID type
  */

src/platform/macos/menu_macos.mm

@@ -371,7 +371,7 @@ - (void)menuDidClose:(NSMenu *)menu {
 void MenuItem::SetSubmenu(std::shared_ptr<Menu> submenu) {
     pimpl_->submenu_ = submenu;
     if (submenu) {
-        [pimpl_->ns_menu_item_ setSubmenu:(NSMenu*)submenu->GetNativeMenu()];
+        [pimpl_->ns_menu_item_ setSubmenu:(__bridge NSMenu*)submenu->GetNativeMenu()];
     } else {
         [pimpl_->ns_menu_item_ setSubmenu:nil];
     }
@@ -468,7 +468,7 @@ - (void)menuDidClose:(NSMenu *)menu {
     if (!item) return;
 
     pimpl_->items_.push_back(item);
-    [pimpl_->ns_menu_ addItem:(NSMenuItem*)item->GetNativeItem()];
+    [pimpl_->ns_menu_ addItem:(__bridge NSMenuItem*)item->GetNativeItem()];
 }
 
 void Menu::InsertItem(size_t index, std::shared_ptr<MenuItem> item) {
@@ -480,15 +480,15 @@ - (void)menuDidClose:(NSMenu *)menu {
     }
 
     pimpl_->items_.insert(pimpl_->items_.begin() + index, item);
-    [pimpl_->ns_menu_ insertItem:(NSMenuItem*)item->GetNativeItem() atIndex:index];
+    [pimpl_->ns_menu_ insertItem:(__bridge NSMenuItem*)item->GetNativeItem() atIndex:index];
 }
 
 bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
     if (!item) return false;
 
     auto it = std::find(pimpl_->items_.begin(), pimpl_->items_.end(), item);
     if (it != pimpl_->items_.end()) {
-        [pimpl_->ns_menu_ removeItem:(NSMenuItem*)item->GetNativeItem()];
+        [pimpl_->ns_menu_ removeItem:(__bridge NSMenuItem*)item->GetNativeItem()];
         pimpl_->items_.erase(it);
         return true;
     }
@@ -498,7 +498,7 @@ - (void)menuDidClose:(NSMenu *)menu {
 bool Menu::RemoveItemById(MenuItemID item_id) {
     for (auto it = pimpl_->items_.begin(); it != pimpl_->items_.end(); ++it) {
         if ((*it)->id == item_id) {
-            [pimpl_->ns_menu_ removeItem:(NSMenuItem*)(*it)->GetNativeItem()];
+            [pimpl_->ns_menu_ removeItem:(__bridge NSMenuItem*)(*it)->GetNativeItem()];
             pimpl_->items_.erase(it);
             return true;
         }
@@ -510,7 +510,7 @@ - (void)menuDidClose:(NSMenu *)menu {
     if (index >= pimpl_->items_.size()) return false;
 
     auto item = pimpl_->items_[index];
-    [pimpl_->ns_menu_ removeItem:(NSMenuItem*)item->GetNativeItem()];
+    [pimpl_->ns_menu_ removeItem:(__bridge NSMenuItem*)item->GetNativeItem()];
     pimpl_->items_.erase(pimpl_->items_.begin() + index);
     return true;
 }