doc improvements

.github/workflows/linux.yml

@@ -50,7 +50,7 @@ jobs:
             CC: gcc-9
             CXX: g++-9
             ruby: '2.5'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -61,7 +61,7 @@ jobs:
             CC: gcc-10
             CXX: g++-10
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -72,7 +72,7 @@ jobs:
             CC: gcc-11
             CXX: g++-11
             ruby: '3.0'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -83,7 +83,7 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -94,7 +94,7 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -105,7 +105,7 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true

.github/workflows/mac.yml

@@ -52,7 +52,7 @@ jobs:
         - name: wxMac macOS 11
           runner: macos-11
           arch: x86_64
-          wxWidgets: '3.2.2.1'
+          wxWidgets: '3.2.4'
           ruby: '3.2'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -61,7 +61,7 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.2.1'
+          wxWidgets: '3.2.4'
           ruby: '3.2'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -70,7 +70,7 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.2.1'
+          wxWidgets: '3.2.4'
           ruby: '3.2'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -79,7 +79,7 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.2.1'
+          wxWidgets: '3.2.4'
           ruby: '3.2'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -88,7 +88,7 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.2.1'
+          wxWidgets: '3.2.4'
           ruby: '3.2'
           swig: '4'
           configure_flags: --disable-sys-libs

.github/workflows/msw.yml

@@ -54,39 +54,39 @@ jobs:
             platform: 'x64'
             CXX: g++-12
             ruby: '2.7'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: develop
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: bingem
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: gem

.github/workflows/pages.yml

@@ -82,7 +82,7 @@ jobs:
 
       - name: Generate wxRuby3 docs
         run: |
-          BUILD_CMD="bundle exec rake doc"
+          BUILD_CMD="bundle exec rake doc WXRUBY_FULLDOCS=1"
           /bin/bash -o pipefail -c "xvfb-run -a -s '-screen 0 1600x1200x24' $BUILD_CMD 2>&1 | tee -a gembuild.out" || rc=$?
           if [ -n "$rc" ]; then
             if fgrep -q '(core dumped)' gembuild.out; then
@@ -96,10 +96,6 @@ jobs:
         run: |
           bundle exec yardoc
 
-      - name: Copy assets into HTML output folder
-        run: |
-          cp -r assets rdoc
-
       - name: Setup Pages
         uses: actions/configure-pages@v3
 

.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -197,7 +197,7 @@ jobs:
           - name: wxMac macOS 13
             runner: macos-13
             arch: x86_64
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             ruby: '3.2'
             swig: '4'
             configure_flags: --disable-sys-libs
@@ -294,7 +294,7 @@ jobs:
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
 
     steps:
@@ -376,7 +376,7 @@ jobs:
             platform: 'x64'
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.2.1'
+            wxWidgets: '3.2.4'
             swig: '4'
 
     steps:

.yardopts

@@ -3,6 +3,7 @@
 --charset UTF-8
 --markup markdown
 --readme README.md
+--asset assets
 --title "wxRuby3 API Documentation"
 --output-dir rdoc
 --protected

ext/wxruby3/include/wxruby-Config.h

@@ -456,7 +456,7 @@ class wxRbHashConfig : public wxConfigBase
   }
 
 #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-  virtual bool DoReadLongLong(const wxString& key, wxLongLong_t *pll) const
+  virtual bool DoReadLongLong(const wxString& key, wxLongLong_t *pll) const override
   {
     wxConfigPathChanger path(this, key);
 
@@ -487,7 +487,7 @@ class wxRbHashConfig : public wxConfigBase
   }
 #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 
-  virtual bool DoReadDouble(const wxString& key, double* val) const
+  virtual bool DoReadDouble(const wxString& key, double* val) const override
   {
     wxConfigPathChanger path(this, key);
 
@@ -517,7 +517,7 @@ class wxRbHashConfig : public wxConfigBase
     }
   }
 
-  virtual bool DoReadBool(const wxString& key, bool* val) const
+  virtual bool DoReadBool(const wxString& key, bool* val) const override
   {
     wxConfigPathChanger path(this, key);
 
@@ -637,7 +637,7 @@ class wxRbHashConfig : public wxConfigBase
   }
 
 #ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-  virtual bool DoWriteLongLong(const wxString& key, wxLongLong_t value)
+  virtual bool DoWriteLongLong(const wxString& key, wxLongLong_t value) override
   {
     wxConfigPathChanger     path(this, key);
     wxString                strName = path.Name();
@@ -675,7 +675,7 @@ class wxRbHashConfig : public wxConfigBase
   }
 #endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
 
-  virtual bool DoWriteDouble(const wxString& key, double value)
+  virtual bool DoWriteDouble(const wxString& key, double value) override
   {
     wxConfigPathChanger     path(this, key);
     wxString                strName = path.Name();
@@ -712,7 +712,7 @@ class wxRbHashConfig : public wxConfigBase
     return true;
   }
 
-  virtual bool DoWriteBool(const wxString& key, bool value)
+  virtual bool DoWriteBool(const wxString& key, bool value) override
   {
     wxConfigPathChanger     path(this, key);
     wxString                strName = path.Name();

lib/wx/doc/app.rb

@@ -5,42 +5,52 @@
 # :startdoc:
 
 
-class Wx::App
-
-  # Set the menu item id for the About menu item.
-  # Default is {Wx::ID_ABOUT}
-  # @param [Integer] id
-  def set_mac_about_menu_itemid(id) end
-  alias :mac_about_menu_itemid= :set_mac_about_menu_itemid
-
-  # Get the current menu item id for the About menu item.
-  # Default is {Wx::ID_ABOUT}
-  # @return [Integer]
-  def get_mac_about_menu_itemid(id) end
-  alias :mac_about_menu_itemid :get_mac_about_menu_itemid
-
-  # Set the menu item id for the Preferences menu item.
-  # Default is {Wx::ID_PREFERENCES}
-  # @param [Integer] id
-  def set_mac_preferences_menu_itemid(id) end
-  alias :mac_preferences_menu_itemid= :set_mac_preferences_menu_itemid
-
-  # Get the current menu item id for the Preferences menu item.
-  # Default is {Wx::ID_PREFERENCES}
-  # @return [Integer]
-  def get_mac_preferences_menu_itemid(id) end
-  alias :mac_preferences_menu_itemid :get_mac_preferences_menu_itemid
-
-  # Set the menu item id for the Exit menu item.
-  # Default is {Wx::ID_EXIT}
-  # @param [Integer] id
-  def set_mac_exit_menu_itemid(id) end
-  alias :mac_exit_menu_itemid= :set_mac_exit_menu_itemid
-
-  # Get the current menu item id for the Exit menu item.
-  # Default is {Wx::ID_EXIT}
-  # @return [Integer]
-  def get_mac_exit_menu_itemid(id) end
-  alias :mac_exit_menu_itemid :get_mac_exit_menu_itemid
-
+module Wx
+
+  class App
+
+    # Set the menu item id for the About menu item.
+    # Default is {Wx::ID_ABOUT}
+    # @param [Integer] id
+    # @wxrb_require WXOSX
+    def set_mac_about_menu_itemid(id) end
+    alias :mac_about_menu_itemid= :set_mac_about_menu_itemid
+
+    # Get the current menu item id for the About menu item.
+    # Default is {Wx::ID_ABOUT}
+    # @return [Integer]
+    # @wxrb_require WXOSX
+    def get_mac_about_menu_itemid(id) end
+    alias :mac_about_menu_itemid :get_mac_about_menu_itemid
+
+    # Set the menu item id for the Preferences menu item.
+    # Default is {Wx::ID_PREFERENCES}
+    # @param [Integer] id
+    # @wxrb_require WXOSX
+    def set_mac_preferences_menu_itemid(id) end
+    alias :mac_preferences_menu_itemid= :set_mac_preferences_menu_itemid
+
+    # Get the current menu item id for the Preferences menu item.
+    # Default is {Wx::ID_PREFERENCES}
+    # @return [Integer]
+    # @wxrb_require WXOSX
+    def get_mac_preferences_menu_itemid(id) end
+    alias :mac_preferences_menu_itemid :get_mac_preferences_menu_itemid
+
+    # Set the menu item id for the Exit menu item.
+    # Default is {Wx::ID_EXIT}
+    # @param [Integer] id
+    # @wxrb_require WXOSX
+    def set_mac_exit_menu_itemid(id) end
+    alias :mac_exit_menu_itemid= :set_mac_exit_menu_itemid
+
+    # Get the current menu item id for the Exit menu item.
+    # Default is {Wx::ID_EXIT}
+    # @return [Integer]
+    # @wxrb_require WXOSX
+    def get_mac_exit_menu_itemid(id) end
+    alias :mac_exit_menu_itemid :get_mac_exit_menu_itemid
+
+  end
+
 end