Changeset 559cd60 in git for src/mainfrm.cc


Ignore:
Timestamp:
04/09/19 03:25:57 (7 weeks ago)
Author:
Olly Betts <olly@…>
Branches:
master
Children:
b74755e
Parents:
7061908
Message:

Consistently refer to macOS not OS X, etc

Apple renamed it yet again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mainfrm.cc

    r7061908 r559cd60  
    803803    filemenu->AppendSeparator();
    804804#else
    805     // We suppress the "Help" menu under OS X as it would otherwise end up as
     805    // We suppress the "Help" menu under macOS as it would otherwise end up as
    806806    // an empty menu, but we need to add the "About" menu item somewhere.  It
    807807    // really doesn't matter where as wxWidgets will move it to the "Apple"
     
    927927    viewmenu->AppendSeparator();
    928928#ifdef __WXMAC__
    929     // F11 on OS X is used by the desktop (for speaker volume and/or window
    930     // navigation).  The standard OS X shortcut for full screen mode is
     929    // F11 on macOS is used by the desktop (for speaker volume and/or window
     930    // navigation).  The standard macOS shortcut for full screen mode is
    931931    // Ctrl-Command-F which in wxWidgets terms is RawCtrl+Ctrl+F.
    932932    wxString wxmac_fullscreen = wmsg(/*Full Screen &Mode\tF11*/356);
    933933    wxmac_fullscreen.Replace(wxT("\tF11"), wxT("\tRawCtrl+Ctrl+F"), false);
    934934    viewmenu->AppendCheckItem(menu_VIEW_FULLSCREEN, wxmac_fullscreen);
    935     // FIXME: On OS X, the standard wording here is "Enter Full Screen" and
     935    // FIXME: On macOS, the standard wording here is "Enter Full Screen" and
    936936    // "Exit Full Screen", depending whether we are in full screen mode or not,
    937937    // and this isn't a checked menu item.
     
    16301630{
    16311631#ifdef __WXMAC__
    1632     // GetIcon() returns an invalid wxIcon under OS X.
     1632    // GetIcon() returns an invalid wxIcon under macOS.
    16331633    AboutDlg dlg(this, wxICON(aven));
    16341634#else
     
    23732373void MainFrm::ViewFullScreen() {
    23742374#ifdef __WXMAC__
    2375     // On OS X, wxWidgets doesn't currently hide the toolbar or statusbar in
     2375    // On macOS, wxWidgets doesn't currently hide the toolbar or statusbar in
    23762376    // full screen mode (last checked with 3.0.2), but it is easy to do
    23772377    // ourselves.
     
    24102410        return;
    24112411#ifdef __WXMAC__
    2412     // On OS X, enabling the menu bar while in full
     2412    // On macOS, enabling the menu bar while in full
    24132413    // screen mode doesn't have any effect, so instead
    24142414    // make moving the mouse to the top of the screen
Note: See TracChangeset for help on using the changeset viewer.