wxFontMapper now cooperates with wxEncodingConverter

[wxWidgets.git] / docs / symbols.txt

diff --git a/docs/symbols.txt b/docs/symbols.txt
index 1b72400ec260dbc7e4b18e8117be4d74b9182357..633162fb3024c55386dcbff139f3194572e1301b 100644 (file)
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -4,17 +4,25 @@ GUIs:
 -----
 
 __X__           any X, but not GTK
-__MOTIF__       Motif
-__XT__          Xt; mutually exclusive with WX_MOTIF (?)
-__GTK__         GTK
-__XVIEW__       Obsolete!
-__WINDOWS__     Any Windows
-__MAC__         MacOS
+__WXMOTIF__     Motif
+__WXXT__        Xt; mutually exclusive with WX_MOTIF (?)
+__WXGTK__       GTK
+__WXGTK12__     GTK 1.2 or higher
+__WXMSW__       Any Windows
+__WXWINE__      WINE (i.e. Win32 on Unix)
+__WXMAC__       MacOS
+__WXPM__        OS/2 native Presentation Manager
 __UNIX__        any Unix
+__WINDOWS__     any Windows
 __WIN95__       GUI for Windows 95 and above; NT 4.0 and above.
 __WIN32__       WIN32 API
 __NT__          Windows NT
-__CURSES__      CURSES
+__WXCURSES__    CURSES
+__WXSTUBS__     Stubbed version ('template' wxWin implementation)
+
+In fact, they should better all start with __WX instead of __ only. 
+The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
+yet. Any new ones, please start the define with __WX.
 
 OSes/machines:
 
@@ -45,12 +53,12 @@ __BORLANDC__    Borland C++
 __WATCOMC__     Watcom C++
 __SYMANTECC__   Symantec C++
 __VISUALC__     VC++
-__SUNCC__
+__SUNCC__       Sun CC
 __XLC__         ?? compiler
 
 wxWindows modes:
 ----------------
 
-__WXDEBUG__       usage: #ifdef __DEBUG__ (=> debug mode, else => release)
+__WXDEBUG__       usage: #ifdef __WXDEBUG__ (=> debug mode, else => release)
 WXDEBUG         usage: #if DEBUG (0: release, 1: minimal debug code, ...)