[Git][wxwidgets/wxwidgets][master] 5 commits: Fix typo in GetSharedLibrariesDir() documentation

0 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Aug 27, 2025, 9:25:03 AM (11 days ago) Aug 27
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • 79cc7b4a
    by Vadim Zeitlin at 2025-08-24T19:46:36+02:00
    Fix typo in GetSharedLibrariesDir() documentation
    
  • df43a22d
    by mcorino at 2025-08-26T00:05:52+02:00
    Fix error in wxMenuItem::GetDisabledBitmapBundle documentation
    
    Use the correct return type.
    
    Closes #25724.
    
  • 1d51d790
    by Vadim Zeitlin at 2025-08-26T14:41:36+02:00
    Try running iOS build under macOS 14
    
    The build doesn't work under macos-latest any more with xcodebuild
    complaining about not being to find iOS platform, so try running it
    under the previous versions.
    
    See #25727.
    
  • e87cf7c9
    by Vadim Zeitlin at 2025-08-27T12:44:48+02:00
    Try running iOS CI build under macOS 15 with Xcode 16.4
    
    Explicitly select the Xcode version to use.
    
  • d364b0b6
    by Vadim Zeitlin at 2025-08-27T15:07:37+02:00
    Merge branch 'ios-ci'
    
    Fix iOS CI after GitHub image changes.
    
    See #25728.
    

3 changed files:

Changes:

  • .github/workflows/ci_mac_xcode.yml
    ... ... @@ -90,14 +90,15 @@ jobs:
    90 90
               configuration: 'Release'
    
    91 91
               project: samples/minimal/minimal_cocoa.xcodeproj
    
    92 92
             - name: iOS static Debug
    
    93
    -          runner: macos-latest
    
    93
    +          runner: macos-15
    
    94
    +          xcode: Xcode_16.4
    
    94 95
               scheme: 'static'
    
    95 96
               destination: 'generic/platform=iOS'
    
    96 97
               arch: x86_64
    
    97 98
               configuration: 'Debug'
    
    98 99
               project: build/osx/wxiphone.xcodeproj
    
    99 100
             - name: iOS Simulator static
    
    100
    -          runner: macos-latest
    
    101
    +          runner: macos-15
    
    101 102
               scheme: 'app-static'
    
    102 103
               destination: 'generic/platform=iOS Simulator'
    
    103 104
               arch: arm64
    
    ... ... @@ -114,6 +115,10 @@ jobs:
    114 115
           with:
    
    115 116
             submodules: recursive
    
    116 117
     
    
    118
    +    - name: Configure Xcode
    
    119
    +      if: ${{ matrix.xcode }}
    
    120
    +      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
    
    121
    +
    
    117 122
         - name: Build
    
    118 123
           run: |
    
    119 124
             xcodebuild clean build ONLY_ACTIVE_ARCH=NO \
    

  • interface/wx/menuitem.h
    ... ... @@ -224,7 +224,7 @@ public:
    224 224
     
    
    225 225
             @since 3.3.2
    
    226 226
         */
    
    227
    -    wxBitmap GetDisabledBitmapBundle() const;
    
    227
    +    wxBitmapBundle GetDisabledBitmapBundle() const;
    
    228 228
     
    
    229 229
         /**
    
    230 230
             Returns the font associated with the menu item.
    

  • interface/wx/stdpaths.h
    ... ... @@ -442,7 +442,7 @@ public:
    442 442
         virtual wxString GetUserLocalDataDir() const;
    
    443 443
     
    
    444 444
         /**
    
    445
    -        Return OS specific directory where project shared liraries are.
    
    445
    +        Return OS specific directory where project shared libraries are.
    
    446 446
     
    
    447 447
             The function does the same thing as GetPluginsDir() under non-Mac platforms
    
    448 448
             but differs from it under Mac, where plugins (shared libraries loaded by the
    

Reply all
Reply to author
Forward
0 new messages