Changeset 559cd60 in git


Ignore:
Timestamp:
04/09/19 03:25:57 (6 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.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r7061908 r559cd60  
    8383
    8484mswindows=no
    85 macosx=no
     85macos=no
    8686case $host_os in
    87 darwin*) macosx=yes ;;
     87darwin*) macos=yes ;;
    8888*mingw*|*cygwin*|windows*) mswindows=yes ;;
    8989esac
     
    106106
    107107AM_CONDITIONAL(WIN32, [test yes = "$mswindows"])
    108 AM_CONDITIONAL(MACOSX, [test yes = "$macosx"])
     108AM_CONDITIONAL(MACOS, [test yes = "$macos"])
    109109
    110110if test -n "$WX_CONFIG" ; then
     
    117117  fi
    118118else
    119   if test yes = "$macosx" ; then
     119  if test yes = "$macos" ; then
    120120    wxdef=__WXMAC__
    121121  elif test yes = "$mswindows" ; then
     
    161161AC_CHECK_LIB([GL], [glPushMatrix], [WX_LIBS="$WX_LIBS -lGL"], [], [$WX_LIBS])
    162162AC_SUBST(WX_LIBS)
    163 dnl Mac OS X has OpenGL/gl.h.
     163dnl macOS has OpenGL/gl.h.
    164164AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], [], [], [ ])
    165 dnl The Debian mingw-w64 packages lack GL/glext.h; Mac OS X has OpenGL/glext.h.
     165dnl The Debian mingw-w64 packages lack GL/glext.h; macOS has OpenGL/glext.h.
    166166AC_CHECK_HEADERS([GL/glext.h OpenGL/glext.h], [], [], [#include <GL/gl.h>])
    167167
  • debian/control

    r7061908 r559cd60  
    1818Description: cave surveying and mapping software
    1919 A software suite to process, view, and print cave survey data.  Survex
    20  is cross-platform (Linux, Unix, Mac OS X, Microsoft Windows).  It has
     20 is cross-platform (Linux, Unix, macOS, Microsoft Windows).  It has
    2121 been translated into many languages.  It can deal with extremely large and
    2222 complex datasets and can read survey data from many sources.
  • doc/manual.sgml

    r7061908 r559cd60  
    129129<Para><Application>Survex</Application> is a multi-platform open-source cave surveying
    130130package.
    131 Version 1.2 runs on UNIX, Microsoft Windows, and Mac OS X.
     131Version 1.2 runs on UNIX, Microsoft Windows, and macOS.
    132132We're investigating support for phones and tablets.
    133133</Para>
     
    40044004
    40054005<Para>Aven is built on <Application>wxWidgets</Application>, which means that it can easily support
    4006 Unix, Microsoft Windows, and Mac OS X.</Para>
     4006Unix, Microsoft Windows, and macOS.</Para>
    40074007
    40084008<Para>More information on our plans is on the <ulink
  • lib/INSTALL.OSX

    r7061908 r559cd60  
    1 Installing Survex on Mac OS X
    2 =============================
     1Installing Survex on macOS
     2==========================
    33
    44Next to the INSTALL file that you are currently reading is the Survex folder.
     
    3131   debugging.
    3232
    33 Known shortcomings specific to the Mac OS X version of Survex
    34 =============================================================
     33Known shortcomings specific to the macOS version of Survex
     34==========================================================
    3535
    3636These could be reproduced with Survex 1.2.19 when built using wxWidgets 3.0.2:
    3737
    38  * On OS X, usually you can push the mouse pointer against the top of the
     38 * On macOS, usually you can push the mouse pointer against the top of the
    3939   screen to get the menu bar to appear, but this doesn't seem to work for
    4040   aven.  As a workaround, aven detects if you're trying to do this and
  • src/Makefile.am

    r7061908 r559cd60  
    6969survexport_LDADD = $(LIBOBJS) $(WX_LIBS) $(PROJ_LIBS)
    7070
    71 if MACOSX
     71if MACOS
    7272# FIXME: It looks like modern wx-config should give us this...
    7373aven_LDFLAGS += -framework OpenGL
  • src/cmdline.h

    r7061908 r559cd60  
    2626
    2727/* Duplicate these from getopt.h to avoid problems
    28  * with trying to compile getopt.h with C++ on MacOS X */
     28 * with trying to compile getopt.h with C++ on macOS */
    2929#ifndef no_argument
    3030/* These values are definitely correct since getopt.h says 0, 1, 2 work */
  • src/img.c

    r7061908 r559cd60  
    868868         pimg->datestamp_numeric = v;
    869869      /* FIXME: We're assuming here that the C time_t epoch is 1970, which is
    870        * true for Unix-like systems, Mac OS X and Windows, but isn't guaranteed
     870       * true for Unix-like systems, macOS and Windows, but isn't guaranteed
    871871       * by ISO C.
    872872       */
  • src/labelinfo.h

    r7061908 r559cd60  
    3131#include "wx.h"
    3232
    33 // Mac OS X headers pollute the global namespace with generic names like
     33// macOS headers pollute the global namespace with generic names like
    3434// "class Point", which clashes with our "class Point".  So for __WXMAC__
    3535// put our class in a namespace and define Point as a macro.
  • 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
  • src/mainfrm.h

    r7061908 r559cd60  
    5252
    5353#ifdef __WXMAC__
    54 // Currently on OS X, we force use of a generic toolbar, which needs to be put
     54// Currently on macOS, we force use of a generic toolbar, which needs to be put
    5555// in a sizer.
    5656# define USING_GENERIC_TOOLBAR
  • src/message.c

    r7061908 r559cd60  
    894894{
    895895   char *p;
    896 #if OS_UNIX_MACOSX
    897    int msg_macosx_relocatable = 0;
     896#if OS_UNIX_MACOS
     897   int msg_macos_relocatable = 0;
    898898#endif
    899899   SVX_ASSERT(argv);
     
    932932      if (pth[0]) {
    933933         struct stat buf;
    934 #if OS_UNIX_MACOSX
     934#if OS_UNIX_MACOS
    935935# ifndef AVEN
    936          /* On MacOS X the programs may be installed anywhere, with the
     936         /* On macOS the programs may be installed anywhere, with the
    937937          * share directory and the binaries in the same directory. */
    938938         p = use_path(pth, "share/survex/en.msg");
    939939         if (stat(p, &buf) == 0 && S_ISREG(buf.st_mode)) {
    940940            pth_cfg_files = use_path(pth, "share/survex");
    941             msg_macosx_relocatable = 1;
    942             goto macosx_got_msg;
     941            msg_macos_relocatable = 1;
     942            goto macos_got_msg;
    943943         }
    944944         osfree(p);
     
    951951         if (stat(p, &buf) == 0 && S_ISREG(buf.st_mode)) {
    952952            pth_cfg_files = use_path(pth, "../Resources");
    953             msg_macosx_relocatable = 1;
    954             goto macosx_got_msg;
     953            msg_macos_relocatable = 1;
     954            goto macos_got_msg;
    955955         }
    956956         osfree(p);
     
    975975         }
    976976#if defined(__GNUC__) && defined(__APPLE_CC__)
    977 macosx_got_msg:
     977macos_got_msg:
    978978#endif
    979979         osfree(p);
  • src/printing.h

    r7061908 r559cd60  
    2828
    2929// The libgnomeprint and GtkPrint dialogs provide their own preview, as does
    30 // Mac OS X.
     30// macOS.
    3131#if !(defined wxUSE_LIBGNOMEPRINT && wxUSE_LIBGNOMEPRINT) && \
    3232    !(defined wxUSE_GTKPRINT && wxUSE_GTKPRINT) && \
  • src/whichos.h

    r7061908 r559cd60  
    2424# define OS_UNIX 1
    2525#elif defined(__GNUC__) && defined(__APPLE_CC__)
    26 /* MacOS X is Unix for most purposes. */
     26/* macOS is Unix for most purposes. */
    2727# define OS_UNIX 1
    28 # define OS_UNIX_MACOSX 1
     28# define OS_UNIX_MACOS 1
    2929#endif
    3030
     
    3939#endif
    4040
    41 #ifndef OS_UNIX_MACOSX
    42 # define OS_UNIX_MACOSX 0
     41#ifndef OS_UNIX_MACOS
     42# define OS_UNIX_MACOS 0
    4343#endif
    4444
Note: See TracChangeset for help on using the changeset viewer.