Refactor native object access with NativeObjectProvider

Introduced NativeObjectProvider base class to standardize access to platform-specific native objects. Refactored Menu, MenuItem, and Window classes to inherit from NativeObjectProvider and moved platform-specific native object retrieval to GetNativeObjectInternal(). Updated all platform implementations to override GetNativeObjectInternal() instead of GetNativeObject().

Author: lijy91

src/foundation/native_object_provider.h

@@ -0,0 +1,80 @@
+#pragma once
+
+namespace nativeapi {
+
+/**
+ * @brief Base class that provides access to platform-specific native objects.
+ * 
+ * This class provides a standardized way for cross-platform wrapper classes
+ * to expose their underlying platform-specific objects. Similar to how
+ * EventEmitter provides event-related functionality, NativeObjectProvider
+ * provides native object access functionality.
+ * 
+ * Classes that inherit from NativeObjectProvider can provide access to:
+ * - NSWindow*, NSMenu*, NSMenuItem* on macOS
+ * - HWND, HMENU on Windows  
+ * - GtkWidget*, GtkMenu* on Linux
+ * 
+ * Example usage:
+ * 
+ * class MyWidget : public NativeObjectProvider {
+ * public:
+ *   MyWidget() : native_widget_(CreatePlatformWidget()) {}
+ *   
+ * protected:
+ *   void* GetNativeObjectInternal() const override {
+ *     return native_widget_;
+ *   }
+ *   
+ * private:
+ *   void* native_widget_;
+ * };
+ * 
+ * // Usage
+ * MyWidget widget;
+ * void* native = widget.GetNativeObject();
+ * 
+ * #ifdef __APPLE__
+ *   NSView* nsview = (__bridge NSView*)native;
+ * #elif defined(_WIN32)
+ *   HWND hwnd = (HWND)native;
+ * #endif
+ */
+class NativeObjectProvider {
+ public:
+  /**
+   * @brief Virtual destructor to ensure proper cleanup in derived classes.
+   */
+  virtual ~NativeObjectProvider() = default;
+
+  /**
+   * @brief Get the native platform-specific object.
+   * 
+   * This method provides access to the underlying platform-specific
+   * object for advanced use cases. Use with caution as this breaks
+   * the abstraction layer.
+   * 
+   * @return Pointer to the native object
+   * 
+   * Platform-specific return types:
+   * - macOS: NSWindow*, NSMenu*, NSMenuItem*, NSView*, etc.
+   * - Windows: HWND, HMENU, etc.
+   * - Linux: GtkWidget*, GtkMenu*, GdkWindow*, etc.
+   */
+  void* GetNativeObject() const {
+    return GetNativeObjectInternal();
+  }
+
+ protected:
+  /**
+   * @brief Internal method to be implemented by derived classes.
+   * 
+   * Derived classes must implement this method to return their
+   * platform-specific native object.
+   * 
+   * @return Pointer to the platform-specific native object
+   */
+  virtual void* GetNativeObjectInternal() const = 0;
+};
+
+}  // namespace nativeapi

src/menu.h

@@ -8,6 +8,7 @@
 #include "event_emitter.h"
 #include "geometry.h"
 #include "menu_event.h"
+#include "foundation/native_object_provider.h"
 
 namespace nativeapi {
 
@@ -156,20 +157,22 @@ class Menu;
  * auto item = MenuItem::Create("Open File", MenuItemType::Normal);
  * item->SetIcon("data:image/png;base64,...");
  * item->SetAccelerator(KeyboardAccelerator("O", KeyboardAccelerator::Ctrl));
- * item->AddListener<MenuItemClickedEvent>([](const MenuItemClickedEvent& event) {
+ * item->AddListener<MenuItemClickedEvent>([](const MenuItemClickedEvent& event)
+ * {
  *     // Handle menu item click
  *     std::cout << "Opening file..." << std::endl;
  * });
  *
  * // Create a checkbox item
  * auto checkbox = MenuItem::Create("Show Toolbar", MenuItemType::Checkbox);
  * checkbox->SetChecked(true);
- * checkbox->AddListener<MenuItemClickedEvent>([](const MenuItemClickedEvent& event) {
- *     std::cout << "Toolbar clicked, handle state change manually" << std::endl;
+ * checkbox->AddListener<MenuItemClickedEvent>([](const MenuItemClickedEvent&
+ * event) { std::cout << "Toolbar clicked, handle state change manually" <<
+ * std::endl;
  * });
  * ```
  */
-class MenuItem : public EventEmitter {
+class MenuItem : public EventEmitter, public NativeObjectProvider {
  public:
   /**
    * @brief Factory method to create a new menu item.
@@ -435,7 +438,6 @@ class MenuItem : public EventEmitter {
    */
   void RemoveSubmenu();
 
-
   /**
    * @brief Programmatically trigger this menu item.
    *
@@ -446,17 +448,6 @@ class MenuItem : public EventEmitter {
    */
   bool Trigger();
 
-  /**
-   * @brief Get the native platform-specific menu item object.
-   *
-   * This method provides access to the underlying platform-specific
-   * menu item for advanced use cases. Use with caution as this breaks
-   * the abstraction layer.
-   *
-   * @return Pointer to the native menu item object
-   */
-  void* GetNativeObject() const;
-
   /**
    * @brief Emit a menu item selected event.
    *
@@ -477,6 +468,17 @@ class MenuItem : public EventEmitter {
    */
   void EmitStateChangedEvent(bool checked);
 
+ protected:
+  /**
+   * @brief Internal method to get the platform-specific native menu item object.
+   * 
+   * This method must be implemented by platform-specific code to return
+   * the underlying native menu item object.
+   * 
+   * @return Pointer to the native menu item object
+   */
+  void* GetNativeObjectInternal() const override;
+
  private:
   friend class Menu;
 
@@ -546,7 +548,7 @@ class MenuItem : public EventEmitter {
  * fileMenu->ShowAsContextMenu(100, 100);
  * ```
  */
-class Menu : public EventEmitter {
+class Menu : public EventEmitter, public NativeObjectProvider {
  public:
   /**
    * @brief Factory method to create a new menu.
@@ -770,7 +772,6 @@ class Menu : public EventEmitter {
    */
   bool IsEnabled() const;
 
-
   /**
    * @brief Create a standard menu item and add it to the menu.
    *
@@ -807,17 +808,6 @@ class Menu : public EventEmitter {
   std::shared_ptr<MenuItem> CreateAndAddSubmenu(const std::string& text,
                                                 std::shared_ptr<Menu> submenu);
 
-  /**
-   * @brief Get the native platform-specific menu object.
-   *
-   * This method provides access to the underlying platform-specific
-   * menu for advanced use cases. Use with caution as this breaks
-   * the abstraction layer.
-   *
-   * @return Pointer to the native menu object
-   */
-  void* GetNativeObject() const;
-
   /**
    * @brief Emit a menu opened event.
    *
@@ -834,6 +824,17 @@ class Menu : public EventEmitter {
    */
   void EmitClosedEvent();
 
+ protected:
+  /**
+   * @brief Internal method to get the platform-specific native menu object.
+   * 
+   * This method must be implemented by platform-specific code to return
+   * the underlying native menu object.
+   * 
+   * @return Pointer to the native menu object
+   */
+  void* GetNativeObjectInternal() const override;
+
  private:
   /**
    * @brief Private constructor for factory methods.

src/platform/linux/menu_linux.cpp

@@ -210,7 +210,7 @@ bool MenuItem::Trigger() {
   return false;
 }
 
-void* MenuItem::GetNativeObject() const {
+void* MenuItem::GetNativeObjectInternal() const {
   return (void*)pimpl_->gtk_menu_item_;
 }
 
@@ -430,7 +430,7 @@ std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(const std::string& text, std
   return item;
 }
 
-void* Menu::GetNativeObject() const {
+void* Menu::GetNativeObjectInternal() const {
   return (void*)pimpl_->gtk_menu_;
 }
 

src/platform/linux/window_linux.cpp

@@ -347,7 +347,7 @@ void Window::StartResizing() {
   // Provide stub implementation
 }
 
-void* Window::GetNativeObject() const {
+void* Window::GetNativeObjectInternal() const {
   return pimpl_ ? pimpl_->gdk_window_ : nullptr;
 }
 

src/platform/macos/menu_macos.mm

@@ -426,7 +426,7 @@ - (void)menuDidClose:(NSMenu *)menu {
     return true;
 }
 
-void* MenuItem::GetNativeObject() const {
+void* MenuItem::GetNativeObjectInternal() const {
     return (__bridge void*)pimpl_->ns_menu_item_;
 }
 
@@ -688,7 +688,7 @@ - (void)menuDidClose:(NSMenu *)menu {
     return item;
 }
 
-void* Menu::GetNativeObject() const {
+void* Menu::GetNativeObjectInternal() const {
     return (__bridge void*)pimpl_->ns_menu_;
 }
 

src/platform/macos/window_macos.mm

@@ -326,7 +326,7 @@
 
 void Window::StartResizing() {}
 
-void* Window::GetNativeObject() const {
+void* Window::GetNativeObjectInternal() const {
   if (!pimpl_) {
     std::cout << "GetNativeObject: pimpl_ is null" << std::endl;
     return nullptr;

src/platform/windows/menu_windows.cpp

@@ -296,7 +296,7 @@ bool MenuItem::Trigger() {
     return true;
 }
 
-void* MenuItem::GetNativeObject() const {
+void* MenuItem::GetNativeObjectInternal() const {
     return reinterpret_cast<void*>(static_cast<uintptr_t>(pimpl_->menu_item_id_));
 }
 
@@ -565,7 +565,7 @@ std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(const std::string& text, std
     return item;
 }
 
-void* Menu::GetNativeObject() const {
+void* Menu::GetNativeObjectInternal() const {
     return pimpl_->hmenu_;
 }
 

src/platform/windows/window_windows.cpp

@@ -486,7 +486,7 @@ void Window::StartResizing() {
   // This would require more complex implementation
 }
 
-void* Window::GetNativeObject() const {
+void* Window::GetNativeObjectInternal() const {
   return pimpl_ ? reinterpret_cast<void*>(pimpl_->hwnd_) : nullptr;
 }
 

src/window.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <string>
 #include "geometry.h"
+#include "foundation/native_object_provider.h"
 
 namespace nativeapi {
 
@@ -20,7 +21,7 @@ struct WindowOptions {
 /**
  * Window is a class that represents a window.
  */
-class Window {
+class Window : public NativeObjectProvider {
  public:
   Window();
   Window(void* window);
@@ -86,11 +87,16 @@ class Window {
   void StartDragging();
   void StartResizing();
 
+ protected:
   /**
-   * @brief Get the native window object for the current platform.
-   * @return NSWindow* on macOS, HWND on Windows, GdkWindow* on Linux
+   * @brief Internal method to get the platform-specific native window object.
+   * 
+   * This method must be implemented by platform-specific code to return
+   * the underlying native window object.
+   * 
+   * @return Pointer to the native window object
    */
-  void* GetNativeObject() const;
+  void* GetNativeObjectInternal() const override;
 
  private:
   class Impl;