Remove CreateAndAddItem and CreateAndAddSubmenu methods

Deprecated convenience methods for creating and adding menu items and submenus have been removed from the Menu class and C API. Example usage in main.c has been updated to use separate creation, configuration, and addition steps for submenu items.

Author: lijy91

examples/tray_icon_c_example/main.c

@@ -151,8 +151,10 @@ int main() {
 
       // Create submenu item and add to main menu
       native_menu_item_t submenu_item =
-          native_menu_create_and_add_submenu(menu, "More Options", submenu);
+          native_menu_item_create("More Options", NATIVE_MENU_ITEM_TYPE_SUBMENU);
       if (submenu_item) {
+        native_menu_item_set_submenu(submenu_item, submenu);
+        native_menu_add_item(menu, submenu_item);
         printf("Created submenu with %zu items\n",
                native_menu_get_item_count(submenu));
       }

src/capi/menu_c.cpp

@@ -1067,67 +1067,7 @@ bool native_menu_remove_listener(native_menu_t menu, int listener_id) {
   }
 }
 
-native_menu_item_t native_menu_create_and_add_item(
-    native_menu_t menu,
-    const char* text,
-    native_menu_item_type_t type) {
-  if (!menu || !text)
-    return nullptr;
-
-  try {
-    // Verify menu exists in global storage
-    auto menu_it = g_menus.find(menu);
-    if (menu_it == g_menus.end())
-      return nullptr;
-
-    auto menu_ptr = static_cast<Menu*>(menu);
-    auto item = menu_ptr->CreateAndAddItem(text);
-    if (item) {
-      if (type != NATIVE_MENU_ITEM_TYPE_NORMAL) {
-        // The CreateAndAddItem only creates normal items, so we need to handle
-        // other types differently For now, just return the normal item - this
-        // could be enhanced later
-      }
-      // Store the created item in global storage
-      void* item_handle = item.get();
-      g_menu_items[item_handle] = item;
-      return static_cast<native_menu_item_t>(item_handle);
-    }
-    return nullptr;
-  } catch (...) {
-    return nullptr;
-  }
-}
 
-native_menu_item_t native_menu_create_and_add_submenu(native_menu_t menu,
-                                                      const char* text,
-                                                      native_menu_t submenu) {
-  if (!menu || !text || !submenu)
-    return nullptr;
-
-  try {
-    // Verify menu exists in global storage
-    auto menu_it = g_menus.find(menu);
-    if (menu_it == g_menus.end())
-      return nullptr;
-
-    auto menu_ptr = static_cast<Menu*>(menu);
-    // Get the shared_ptr from global storage instead of creating a new one
-    auto submenu_it = g_menus.find(submenu);
-    if (submenu_it != g_menus.end()) {
-      auto item = menu_ptr->CreateAndAddSubmenu(text, submenu_it->second);
-      if (item) {
-        // Store the created item in global storage
-        void* item_handle = item.get();
-        g_menu_items[item_handle] = item;
-        return static_cast<native_menu_item_t>(item_handle);
-      }
-    }
-    return nullptr;
-  } catch (...) {
-    return nullptr;
-  }
-}
 
 // Utility functions
 

src/capi/menu_c.h

@@ -577,29 +577,7 @@ int native_menu_add_listener(native_menu_t menu,
 FFI_PLUGIN_EXPORT
 bool native_menu_remove_listener(native_menu_t menu, int listener_id);
 
-/**
- * Create and add a menu item in one operation
- * @param menu The menu
- * @param text The item text
- * @param type The item type
- * @return The created menu item handle
- */
-FFI_PLUGIN_EXPORT
-native_menu_item_t native_menu_create_and_add_item(native_menu_t menu,
-                                                   const char* text,
-                                                   native_menu_item_type_t type);
 
-/**
- * Create and add a submenu item in one operation
- * @param menu The menu
- * @param text The item text
- * @param submenu The submenu to attach
- * @return The created menu item handle
- */
-FFI_PLUGIN_EXPORT
-native_menu_item_t native_menu_create_and_add_submenu(native_menu_t menu,
-                                                      const char* text,
-                                                      native_menu_t submenu);
 
 /**
  * Utility functions

src/menu.h

@@ -733,57 +733,7 @@ class Menu : public EventEmitter, public NativeObjectProvider {
    */
   bool IsEnabled() const;
 
-  /**
-   * @brief Create a standard menu item and add it to the menu.
-   *
-   * Convenience method that creates a normal menu item with the given
-   * text and adds it to the menu in one operation.
-   *
-   * @param text The text for the menu item
-   * @return Shared pointer to the created and added menu item
-   */
-  std::shared_ptr<MenuItem> CreateAndAddItem(const std::string& text);
 
-  /**
-   * @brief Create a menu item with icon and add it to the menu.
-   *
-   * Convenience method that creates a normal menu item with text and icon
-   * and adds it to the menu in one operation.
-   *
-   * @param text The text for the menu item
-   * @param icon The icon for the menu item (file path or base64 data, optional)
-   * @return Shared pointer to the created and added menu item
-   */
-  std::shared_ptr<MenuItem> CreateAndAddItem(const std::string& text,
-                                             const std::optional<std::string>& icon);
-
-  /**
-   * @brief Create a submenu item and add it to the menu.
-   *
-   * Convenience method that creates a submenu item and adds it to the menu.
-   *
-   * @param text The text for the submenu item
-   * @param submenu The submenu to attach
-   * @return Shared pointer to the created and added submenu item
-   */
-  std::shared_ptr<MenuItem> CreateAndAddSubmenu(const std::string& text,
-                                                std::shared_ptr<Menu> submenu);
-
-  /**
-   * @brief Emit a menu opened event.
-   *
-   * This is primarily used by platform implementations to
-   * emit events when a menu has been opened.
-   */
-  void EmitOpenedEvent();
-
-  /**
-   * @brief Emit a menu closed event.
-   *
-   * This is primarily used by platform implementations to
-   * emit events when a menu has been closed.
-   */
-  void EmitClosedEvent();
 
  protected:
   /**

src/platform/linux/menu_linux.cpp

@@ -426,42 +426,10 @@ bool Menu::IsEnabled() const {
   return pimpl_->enabled_;
 }
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(const std::string& text) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  AddItem(item);
-  return item;
-}
-
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(
-    const std::string& text,
-    const std::optional<std::string>& icon) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  if (icon.has_value()) {
-    item->SetIcon(icon);
-  }
-  AddItem(item);
-  return item;
-}
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(
-    const std::string& text,
-    std::shared_ptr<Menu> submenu) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Submenu);
-  item->SetSubmenu(submenu);
-  AddItem(item);
-  return item;
-}
 
 void* Menu::GetNativeObjectInternal() const {
   return (void*)pimpl_->gtk_menu_;
 }
 
-void Menu::EmitOpenedEvent() {
-  // TODO: Implement menu opened event emission for GTK
-}
-
-void Menu::EmitClosedEvent() {
-  // TODO: Implement menu closed event emission for GTK
-}
-
 }  // namespace nativeapi

src/platform/macos/menu_macos.mm

@@ -877,47 +877,10 @@ - (void)menuDidClose:(NSMenu*)menu {
   return pimpl_->enabled_;
 }
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(const std::string& text) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  AddItem(item);
-  return item;
-}
-
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(const std::string& text,
-                                                 const std::optional<std::string>& icon) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  if (icon.has_value()) {
-    item->SetIcon(icon);
-  }
-  AddItem(item);
-  return item;
-}
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(const std::string& text,
-                                                    std::shared_ptr<Menu> submenu) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Submenu);
-  item->SetSubmenu(submenu);
-  AddItem(item);
-  return item;
-}
 
 void* Menu::GetNativeObjectInternal() const {
   return (__bridge void*)pimpl_->ns_menu_;
 }
 
-void Menu::EmitOpenedEvent() {
-  // This method is kept for compatibility but events are now handled through blocks
-  // Call the block if it exists
-  if (pimpl_->delegate_.openedBlock) {
-    pimpl_->delegate_.openedBlock(id);
-  }
-}
-
-void Menu::EmitClosedEvent() {
-  // This method is kept for compatibility but events are now handled through blocks
-  // Call the block if it exists
-  if (pimpl_->delegate_.closedBlock) {
-    pimpl_->delegate_.closedBlock(id);
-  }
-}
 }  // namespace nativeapi

src/platform/windows/menu_windows.cpp

@@ -530,42 +530,10 @@ bool Menu::IsEnabled() const {
   return pimpl_->enabled_;
 }
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(const std::string& text) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  AddItem(item);
-  return item;
-}
-
-std::shared_ptr<MenuItem> Menu::CreateAndAddItem(
-    const std::string& text,
-    const std::optional<std::string>& icon) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Normal);
-  if (icon.has_value()) {
-    item->SetIcon(icon);
-  }
-  AddItem(item);
-  return item;
-}
 
-std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(
-    const std::string& text,
-    std::shared_ptr<Menu> submenu) {
-  auto item = std::make_shared<MenuItem>(text, MenuItemType::Submenu);
-  item->SetSubmenu(submenu);
-  AddItem(item);
-  return item;
-}
 
 void* Menu::GetNativeObjectInternal() const {
   return pimpl_->hmenu_;
 }
 
-void Menu::EmitOpenedEvent() {
-  EmitSync<MenuOpenedEvent>(id);
-}
-
-void Menu::EmitClosedEvent() {
-  EmitSync<MenuClosedEvent>(id);
-}
-
 }  // namespace nativeapi