Changeset a2c91ef in git


Ignore:
Timestamp:
21/09/11 01:21:35 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
dfb3e12
Parents:
2676b0a
Message:

src/aboutdlg.cc: Make wx version and toolkit info a single string at
compile time, like we do on trunk.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3730 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r2676b0a ra2c91ef  
     1Wed Sep 21 00:20:26 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/aboutdlg.cc: Make wx version and toolkit info a single string at
     4          compile time, like we do on trunk.
     5
    16Wed Sep 21 00:15:07 GMT 2011  Olly Betts <olly@survex.com>
    27
  • src/aboutdlg.cc

    r2676b0a ra2c91ef  
    134134    wxString info(wxGetOsDescription());
    135135#endif
    136     info += '\n';
    137     info += wxVERSION_STRING;
     136    info += "\n" wxVERSION_STRING
    138137#ifdef __WXGTK__
    139 #if defined __WXGTK26__
    140     info += " (GTK+ >= 2.6)";
    141 #elif defined __WXGTK24__
    142     info += " (GTK+ >= 2.4)";
    143 #elif defined __WXGTK20__
    144     info += " (GTK+ >= 2.0)";
    145 #elif defined __WXGTK12__
    146     info += " (GTK+ >= 1.2)";
     138# if defined __WXGTK26__
     139        " (GTK+ >= 2.6)\n";
     140# elif defined __WXGTK24__
     141        " (GTK+ >= 2.4)\n";
     142# elif defined __WXGTK20__
     143        " (GTK+ >= 2.0)\n";
     144# elif defined __WXGTK12__
     145        " (GTK+ >= 1.2)\n";
     146# else
     147        " (GTK+ < 1.2)\n";
     148# endif
     149#elif defined __WXMOTIF__
     150# if defined __WXMOTIF20__
     151        " (Motif >= 2.0)\n";
     152# else
     153        " (Motif < 2.0)\n";
     154# endif
     155#elif defined __WXX11__
     156        " (X11)\n";
    147157#else
    148     info += " (GTK+ < 1.2)";
     158        "\n";
    149159#endif
    150 #elif defined __WXMOTIF__
    151 #if defined __WXMOTIF20__
    152     info += " (Motif >= 2.0)";
    153 #else
    154     info += " (Motif < 2.0)";
    155 #endif
    156 #elif defined __WXX11__
    157     info += " (X11)";
    158 #endif
    159     info += '\n';
    160160    int bpp = wxDisplayDepth();
    161161    info += wxString::Format("Display Depth: %d bpp", bpp);
Note: See TracChangeset for help on using the changeset viewer.