From 9bea227d4eda532f377dde715aab0a1efe98a7bb Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Wed, 26 Jan 2005 07:35:28 +0000 Subject: [PATCH 1/1] Committing in . Update OpenVMS compile support Modified Files: wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms wxWidgets/src/generic/descrip.mms wxWidgets/src/unix/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- setup.h_vms | 1089 ++++++++++++++------------------------- src/common/descrip.mms | 3 + src/generic/descrip.mms | 6 + src/unix/descrip.mms | 3 + 4 files changed, 387 insertions(+), 714 deletions(-) diff --git a/setup.h_vms b/setup.h_vms index 579a231d7c..5a105ddc39 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -146,624 +146,494 @@ #undef WINVER #endif -/* enable native status bar under Win32 */ -#if defined(__WIN95__) && !defined(__WXUNIVERSAL__) -#define wxUSE_NATIVE_STATUSBAR 1 -#define wxUSE_OWNER_DRAWN 1 -#endif +/* --- start common options --- */ -#if defined(__WXPM__) -#define wxUSE_OWNER_DRAWN 1 + +#ifndef wxUSE_GUI + #define wxUSE_GUI 1 #endif -/* enable rich edit under Win32 */ -#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) -#define wxUSE_RICHEDIT 1 + +#define WXWIN_COMPATIBILITY_2_2 1 + +#define WXWIN_COMPATIBILITY_2_4 1 + +#define wxDIALOG_UNIT_COMPATIBILITY 1 + + + +#define wxUSE_DEBUG_CONTEXT 0 + +#define wxUSE_MEMORY_TRACING 0 + +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +#if defined(_MSC_VER) || \ + (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550) + #define wxUSE_ON_FATAL_EXCEPTION 0 #else -#define wxUSE_RICHEDIT 0 + #define wxUSE_ON_FATAL_EXCEPTION 0 #endif -/* - * Supports bool type - */ -#define HAVE_BOOL +#define wxUSE_STACKWALKER 0 -/* - * Define if your compiler supports the explicit keyword - */ -#define HAVE_EXPLICIT 1 -/* - * Define if your compiler supports const_cast<>() - */ -#define HAVE_CONST_CAST 1 +#ifndef wxUSE_UNICODE + #define wxUSE_UNICODE 0 +#endif -/* - * Define if your compiler supports reinterpret_cast<>() - */ -#define HAVE_REINTERPRET_CAST 1 +#define wxUSE_UNICODE_MSLU 0 -/* - * Define if your compiler supports const_cast<>() - */ -#define HAVE_STATIC_CAST 1 +#define wxUSE_WCHAR_T 1 -/* - * Define if your compiler has C99 va_copy - */ -#undef HAVE_VA_COPY -/* - * Define if va_list type is an array - */ -#undef VA_LIST_IS_ARRAY +#define wxUSE_EXCEPTIONS 0 -/* - * Define if your compiler has std::wstring - */ -/* #unfine HAVE_STD_WSTRING */ -/* - * Define if your compiler has compliant std::string::compare - */ -#undef HAVE_STD_STRING_COMPARE -/* - * Define if your compiler has - */ -#undef HAVE_HASH_MAP -/* - * Define if your compiler has - */ -#undef HAVE_EXT_HASH_MAP -/* - * Define if your compiler has std::hash_map/hash_set - */ -#undef HAVE_STD_HASH_MAP -/* - * Define if your compiler has __gnu_cxx::hash_map/hash_set - */ -#undef HAVE_GNU_CXX_HASH_MAP +#define wxUSE_EXTENDED_RTTI 0 -/* - * use STL for containers and wxString - */ #define wxUSE_STL 0 -/* - * Use regex support - */ -#define wxUSE_REGEX 0 -/* - * The built-in regex supports advanced REs in additional to POSIX's basic - * and extended. Your system regex probably won't support this, and in this - * case WX_NO_REGEX_ADVANCED should be defined. - */ -#undef WX_NO_REGEX_ADVANCED -/* - * Use XML support - */ -#define wxUSE_XML 1 -/* - * Use zlib - */ -#define wxUSE_ZLIB 1 -/* - * Use libpng - */ -#define wxUSE_LIBPNG 1 -/* - * Use libjpeg - */ -#define wxUSE_LIBJPEG 1 -/* - * Use libtiff - */ -#define wxUSE_LIBTIFF 1 -/* - * Use SDL for audio (Unix) - */ -#define wxUSE_LIBSDL 0 -/* - * Use GNOME print for printing under GTK+ 2.0 - */ -#define wxUSE_LIBGNOMEPRINT 0 -/* - * Use iODBC - */ -#define wxUSE_ODBC 1 -#define wxUSE_BUILTIN_IODBC 0 -#define wxODBC_FWD_ONLY_CURSORS 1 -/* - * Use freetype - */ -#define wxUSE_FREETYPE 1 -/* - * Use Threads - */ + +#define wxUSE_LOG 1 + +#define wxUSE_LOGWINDOW 1 + +#define wxUSE_LOGGUI 1 + +#define wxUSE_LOG_DIALOG 0 + +#define wxUSE_CMDLINE_PARSER 1 + #define wxUSE_THREADS 1 -/* - * Have glibc2 - */ -#define wxHAVE_GLIBC2 0 -/* - * Use libXpm - */ -#define wxHAVE_LIB_XPM 1 -/* - * Use OpenGL - */ -#define wxUSE_OPENGL 1 -#define wxUSE_GLCANVAS 1 -/* - * Use GUI - */ -#define wxUSE_GUI 1 -/* - * Don't use GUI (defined to 1 when compiling/using base only) - */ -#define wxUSE_NOGUI 0 -#define wxUSE_BASE 1 -#define __WXBASE__ 1 +#define wxUSE_STREAMS 1 -/* - * Catch fatal program exceptions - */ -#define wxUSE_ON_FATAL_EXCEPTION 0 +#define wxUSE_STD_IOSTREAM 0 -/* - * Use wxSingleInstanceChecker class - */ -#define wxUSE_SNGLINST_CHECKER 1 -/* - * Use constraints mechanism - */ -#define wxUSE_CONSTRAINTS 1 +#define wxUSE_LONGLONG 1 -/* - * Use validators - */ -#define wxUSE_VALIDATORS 1 +#define wxUSE_FILE 1 +#define wxUSE_FFILE 1 -/* - * Use wxControl - */ -#define wxUSE_CONTROLS 1 +#define wxUSE_FSVOLUME 1 + +#define wxUSE_TEXTBUFFER 1 + +#define wxUSE_TEXTFILE 1 + +#define wxUSE_INTL 1 + +#define wxUSE_DATETIME 1 + +#define wxUSE_TIMER 1 + +#define wxUSE_STOPWATCH 1 + +#define wxUSE_CONFIG 1 + +#define wxUSE_CONFIG_NATIVE 0 + +#define wxUSE_DIALUP_MANAGER 1 + +#define wxUSE_DYNLIB_CLASS 1 + +#define wxUSE_DYNAMIC_LOADER 0 + +#define wxUSE_SOCKETS 1 + +#define wxUSE_FILESYSTEM 1 + +#define wxUSE_FS_ZIP 1 + +#define wxUSE_FS_INET 1 + +#define wxUSE_ZIPSTREAM 1 + +#define wxUSE_ZLIB 1 + +#define wxUSE_APPLE_IEEE 0 + +#define wxUSE_JOYSTICK 0 + +#define wxUSE_FONTMAP 1 + +#define wxUSE_MIMETYPE 1 + +#define wxUSE_PROTOCOL 1 + +#define wxUSE_PROTOCOL_FILE 1 +#define wxUSE_PROTOCOL_FTP 1 +#define wxUSE_PROTOCOL_HTTP 1 + +#define wxUSE_URL 1 + +#define wxUSE_URL_NATIVE 0 + +#define wxUSE_REGEX 0 + +#define wxUSE_SYSTEM_OPTIONS 1 + +#define wxUSE_SOUND 1 + +#define wxUSE_MEDIACTRL 1 + +#define wxUSE_QUICKTIME 1 + +#define wxUSE_DIRECTSHOW 1 + +#define wxUSE_XRC 1 + +#if wxUSE_XRC +#define wxUSE_XML 1 +#else +# define wxUSE_XML 1 +#endif + + +#define wxUSE_CONTROLS 1 -/* - * Use wxPopupWindow (useful in wxUniv only for now) - */ #ifdef __WXMOTIF__ #define wxUSE_POPUPWIN 0 #else #define wxUSE_POPUPWIN 1 #endif -/* - Use wxTipWindow -*/ -#define wxUSE_TIPWINDOW 1 +#define wxUSE_TIPWINDOW 1 + +#define wxUSE_BUTTON 1 +#define wxUSE_BMPBUTTON 1 +#define wxUSE_CALENDARCTRL 1 +#define wxUSE_CHECKBOX 1 +#define wxUSE_CHECKLISTBOX 1 +#define wxUSE_CHOICE 1 +#define wxUSE_COMBOBOX 1 +#define wxUSE_DATEPICKCTRL 1 +#define wxUSE_GAUGE 1 +#define wxUSE_LISTBOX 1 +#define wxUSE_LISTCTRL 1 +#define wxUSE_RADIOBOX 1 +#define wxUSE_RADIOBTN 1 +#define wxUSE_SCROLLBAR 1 +#define wxUSE_SLIDER 1 +#define wxUSE_SPINBTN 1 +#define wxUSE_SPINCTRL 1 +#define wxUSE_STATBOX 1 +#define wxUSE_STATLINE 1 +#define wxUSE_STATTEXT 1 +#define wxUSE_STATBMP 1 +#define wxUSE_TEXTCTRL 1 +#define wxUSE_TOGGLEBTN 1 +#define wxUSE_TREECTRL 1 + +#define wxUSE_STATUSBAR 1 + +#if defined(__WXMSW__) || defined(__WXMAC__) +#define wxUSE_NATIVE_STATUSBAR 0 +#else +#define wxUSE_NATIVE_STATUSBAR 0 +#endif + +#define wxUSE_TOOLBAR 1 +#define wxUSE_TOOLBAR_NATIVE 1 + +#define wxUSE_NOTEBOOK 1 + +#define wxUSE_LISTBOOK 1 + +#define wxUSE_CHOICEBOOK 1 + +#define wxUSE_TAB_DIALOG 1 + +#define wxUSE_GRID 1 + +#define wxUSE_MINIFRAME 1 + -/* - * Use accelerators - */ #define wxUSE_ACCEL 1 -/* - * Use wxCalendarCtrl - */ -#define wxUSE_CALENDARCTRL 1 +#define wxUSE_HOTKEY 1 -/* - * Use wxFileDialog - */ -#define wxUSE_FILEDLG 1 +#define wxUSE_CARET 1 -/* - * Use wxFindReplaceDialog - */ -#define wxUSE_FINDREPLDLG 0 +#define wxUSE_DISPLAY 1 -/* - * Use wxFontDialog - */ -#define wxUSE_FONTDLG 1 +#define wxUSE_GEOMETRY 1 -/* - * Use wxMimeTypesManager and related classes - */ -#define wxUSE_MIMETYPE 1 +#define wxUSE_IMAGLIST 1 -/* - * Use wxSystemOptions - */ -#define wxUSE_SYSTEM_OPTIONS 1 +#define wxUSE_MENUS 1 -/* - * Use wxMessageDialog (and wxMessageBox) - */ -#define wxUSE_MSGDLG 1 +#define wxUSE_SASH 1 -/* - * Use wxNumberEntryDialog - */ -#define wxUSE_NUMBERDLG 1 +#define wxUSE_SPLITTER 1 -/* - * Use wxTextEntryDialog - */ -#define wxUSE_TEXTDLG 1 +#if defined (__WXMOTIF__) || defined( __WXX11__ ) +#define wxUSE_TOOLTIPS 0 +#else +#define wxUSE_TOOLTIPS 1 +#endif -/* - * Use startup tips - */ -#define wxUSE_STARTUP_TIPS 1 +#define wxUSE_VALIDATORS 1 -/* - * Use progress dialog - */ -#define wxUSE_PROGRESSDLG 1 -/* - * Use chooser dialog - */ -#define wxUSE_CHOICEDLG 1 +#define wxUSE_COMMON_DIALOGS 1 -/* - * Use colour picker dialog - */ -#define wxUSE_COLOURDLG 1 +#define wxUSE_BUSYINFO 1 + +#define wxUSE_CHOICEDLG 1 + +#define wxUSE_COLOURDLG 1 -/* - * Use directory chooser dialog - */ #define wxUSE_DIRDLG 1 -/* - * Use wxDragImage class - */ -#define wxUSE_DRAGIMAGE 1 -/* - * Use property sheet classes - */ -#define wxUSE_PROPSHEET 1 +#define wxUSE_FILEDLG 1 -/* - * Use wxWizard - */ -#define wxUSE_WIZARDDLG 1 +#define wxUSE_FINDREPLDLG 1 + +#define wxUSE_FONTDLG 1 + +#define wxUSE_MSGDLG 1 + +#define wxUSE_PROGRESSDLG 1 + +#define wxUSE_STARTUP_TIPS 1 + +#define wxUSE_TEXTDLG 1 + +#define wxUSE_NUMBERDLG 1 -/* - * Use splash screen - */ #define wxUSE_SPLASH 1 -/* - * Joystick support (Linux/GTK only) - */ -#define wxUSE_JOYSTICK 0 +#define wxUSE_WIZARDDLG 1 -/* - * Use this control - */ -#define wxUSE_CARET 1 -/* - * Use this control - */ -#define wxUSE_BUTTON 1 -/* - * Use this control - */ -#define wxUSE_BMPBUTTON 1 -/* - * Use this control - */ -#define wxUSE_CHECKBOX 1 -/* - * Use this control - */ -#define wxUSE_CHECKLISTBOX 1 -/* - * Use this control - */ -#define wxUSE_COMBOBOX 1 -/* - * Use this control - */ -#define wxUSE_CHOICE 1 -/* - * Use wxDisplay class - */ -#define wxUSE_DISPLAY 1 -/* - * Use this control - */ -#define wxUSE_GAUGE 1 -/* - * Use this control - */ -#define wxUSE_GRID 1 -/* - * Use the new prototype wxGrid classes - * (wxUSE_GRID must also be defined) - */ -#define wxUSE_NEW_GRID 1 -/* - * Use wxImageList class - */ -#define wxUSE_IMAGLIST 1 -/* - * Use this control - */ -#define wxUSE_LISTBOX 1 -/* - * Use this control - */ -#define wxUSE_LISTCTRL 1 -/* - * Use wxPlot class - */ - #define wxUSE_PLOT 1 -/* - * Use wxMenuBar, wxMenuItem and wxMenu - */ -#define wxUSE_MENUS 1 -/* - * Use this control - */ -#define wxUSE_NOTEBOOK 1 -#define wxUSE_LISTBOOK 1 -#define wxUSE_CHOICEBOOK 1 -/* - * Use this control - */ -#define wxUSE_RADIOBOX 1 -/* - * Use this control - */ -#define wxUSE_RADIOBTN 1 -/* - * Use this control - */ -#define wxUSE_SASH 1 -/* - * Use this control - */ -#define wxUSE_SCROLLBAR 1 -/* - * Use this control - */ -#define wxUSE_SLIDER 1 -/* - * Use this control - */ -#define wxUSE_SPINBTN 1 -/* - * Use this control - */ -#define wxUSE_SPINCTRL 1 -/* - * Use this control - */ -#define wxUSE_SPLITTER 1 -/* - * Use this control - */ -#define wxUSE_STATBMP 1 -/* - * Use this control - */ -#define wxUSE_STATBOX 1 -/* - * Use this control - */ -#define wxUSE_STATLINE 1 -/* - * Use this control - */ -#define wxUSE_STATTEXT 1 -/* - * Use this control - */ -#define wxUSE_STATUSBAR 1 -/* - * Use this control - */ -#ifndef __WXX11__ -#define wxUSE_TOGGLEBTN 1 +#define wxUSE_METAFILE 1 +#define wxUSE_ENH_METAFILE 1 +#define wxUSE_WIN_METAFILES_ALWAYS 1 + + +#define wxUSE_MDI 1 + +#define wxUSE_DOC_VIEW_ARCHITECTURE 1 + +#define wxUSE_MDI_ARCHITECTURE 1 + +#define wxUSE_PRINTING_ARCHITECTURE 1 + +#define wxUSE_HTML 1 + +#define wxUSE_GLCANVAS 1 + + +#define wxUSE_CLIPBOARD 1 + +#define wxUSE_DATAOBJ 1 + +#ifdef __WXGTK__ +#define wxUSE_DRAG_AND_DROP 1 #else -#define wxUSE_TOGGLEBTN 0 +#define wxUSE_DRAG_AND_DROP 0 #endif -/* - * Use Tab dialog class - obsolete, use wxNotebook instead - */ -#define wxUSE_TAB_DIALOG 0 -/* compatibility */ -#define wxUSE_TABDIALOG wxUSE_TAB_DIALOG -/* - * Use wxTextCtrl - */ -#define wxUSE_TEXTCTRL 1 +#define wxUSE_ACCESSIBILITY 0 + + +#define wxUSE_SNGLINST_CHECKER 1 + +#define wxUSE_DRAGIMAGE 1 + +#define wxUSE_IPC 1 + +#define wxUSE_HELP 1 + +#define wxUSE_MS_HTML_HELP 0 + + +#define wxUSE_WXHTML_HELP 1 + +#define wxUSE_RESOURCES 1 + +/* + * Use Prolog IO + */ +#define wxUSE_PROLOGIO 1 + +#define wxUSE_CONSTRAINTS 1 + + +#define wxUSE_SPLINES 1 + + +#define wxUSE_MOUSEWHEEL 1 + + + +#define wxUSE_POSTSCRIPT 1 + +#define wxUSE_AFM_FOR_POSTSCRIPT 1 + +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 + + +#define wxUSE_ODBC 1 + +#define wxODBC_FWD_ONLY_CURSORS 1 + +#define wxODBC_BACKWARD_COMPATABILITY 0 + + +#define REMOVE_UNUSED_ARG 1 + +#define wxUSE_IOSTREAMH 1 + + + +#define wxUSE_IMAGE 1 -/* - * Use wxToollBar - */ -#define wxUSE_TOOLBAR 1 +#define wxUSE_LIBPNG 1 -/* If 1, use the native toolbar, otherwise use the generic version - * (wxToolBarSimple) which may also be use together with the native one. - */ -#define wxUSE_TOOLBAR_NATIVE 1 +#define wxUSE_LIBJPEG 1 -/* - * Use wxTreeLayout class - */ -#define wxUSE_TREELAYOUT 1 +#define wxUSE_LIBTIFF 1 -/* - * Use this control - */ -#define wxUSE_TREECTRL 1 +#define wxUSE_GIF 1 -/* - * Use wxLongLong (a.k.a. int64) class - */ -#define wxUSE_LONGLONG 1 +#define wxUSE_PNM 1 -/* - * Use geometry classes - */ -#define wxUSE_GEOMETRY 1 +#define wxUSE_PCX 1 -/* - * Use wxCmdLineParser class - */ -#define wxUSE_CMDLINE_PARSER 1 -/* - * Use wxDateTime - */ -#define wxUSE_DATETIME 1 -/* - * Use wxFile class - */ -#define wxUSE_FILE 1 -/* - * Use wxFFile class - */ -#define wxUSE_FFILE 1 -/* - * Use wxFSVolume class - */ -#define wxUSE_FSVOLUME 1 +#define wxUSE_IFF 1 -/* - * Use wxTextBuffer class - */ -#define wxUSE_TEXTBUFFER 1 -/* - * Use wxTextFile class - */ -#define wxUSE_TEXTFILE 1 +#define wxUSE_XPM 1 + +#define wxUSE_ICO_CUR 1 + +#define wxUSE_PALETTE 1 + +/* --- end common options --- */ + +/* for some features we don't have dedicated configure switches, so just choose + * the common values automatically */ +#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__) +#define wxUSE_OWNER_DRAWN 1 +#endif + +#if defined(__WXPM__) +#define wxUSE_OWNER_DRAWN 1 +#endif -#define wxUSE_EXCEPTIONS 0 +/* enable rich edit under Win32 */ +#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) +#define wxUSE_RICHEDIT 1 +#else +#define wxUSE_RICHEDIT 0 +#endif /* - * Use log classes and logging functions + * Supports bool type */ -#define wxUSE_LOG 1 +#define HAVE_BOOL + /* - * Use log window + * Define if your compiler supports the explicit keyword */ -#define wxUSE_LOGWINDOW 1 +#define HAVE_EXPLICIT 1 + /* - * Use standard GUI logger + * Define if your compiler supports const_cast<>() */ -#define wxUSE_LOGGUI 1 +#define HAVE_CONST_CAST 1 + /* - * Use old log dialog instead of new wxLogGui + * Define if your compiler supports reinterpret_cast<>() */ -#define wxUSE_LOG_DIALOG 0 +#define HAVE_REINTERPRET_CAST 1 + /* - * Use wxStopWatch + * Define if your compiler supports const_cast<>() */ -#define wxUSE_STOPWATCH 1 +#define HAVE_STATIC_CAST 1 + /* - * Use time and date classes + * Define if your compiler has C99 va_copy */ -#define wxUSE_TIMEDATE 1 +#undef HAVE_VA_COPY + /* - * Use wave class + * Define if va_list type is an array */ -#define wxUSE_SOUND 1 +#undef VA_LIST_IS_ARRAY + /* - * Use wxMediaCtrl class + * Define if your compiler has std::wstring */ -#define wxUSE_MEDIACTRL 1 +/* #unfine HAVE_STD_WSTRING */ /* - * Use DirectShow + * Define if your compiler has compliant std::string::compare */ -#define wxUSE_DIRECTSHOW 1 +#undef HAVE_STD_STRING_COMPARE /* - * Use config system + * Define if your compiler has */ -#define wxUSE_CONFIG 1 +#undef HAVE_HASH_MAP /* - * Use font mapping/conversion classes + * Define if your compiler has */ -#define wxUSE_FONTMAP 1 +#undef HAVE_EXT_HASH_MAP /* - * Use intl system + * Define if your compiler has std::hash_map/hash_set */ -#define wxUSE_INTL 1 +#undef HAVE_STD_HASH_MAP /* - * Use wxProtocol and related classes + * Define if your compiler has __gnu_cxx::hash_map/hash_set */ -#define wxUSE_PROTOCOL 1 -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 +#undef HAVE_GNU_CXX_HASH_MAP + /* - * Use streams + * The built-in regex supports advanced REs in additional to POSIX's basic + * and extended. Your system regex probably won't support this, and in this + * case WX_NO_REGEX_ADVANCED should be defined. */ -#define wxUSE_STREAMS 1 +#undef WX_NO_REGEX_ADVANCED /* - * Use sockets + * Use SDL for audio (Unix) */ -#define wxUSE_SOCKETS 1 +#define wxUSE_LIBSDL 0 /* - * Use dialup manager + * Use GNOME print for printing under GTK+ 2.0 */ -#define wxUSE_DIALUP_MANAGER 1 +#define wxUSE_LIBGNOMEPRINT 0 /* - * Use standard C++ streams if 1. If 0, use wxWin - * streams implementation. + * Use iODBC */ -#define wxUSE_STD_IOSTREAM 0 +#define wxUSE_BUILTIN_IODBC 0 /* - * wxLibrary class + * Use freetype */ -#define wxUSE_DYNLIB_CLASS 1 +#define wxUSE_FREETYPE 1 /* - * Use wxObjectLoader + * Have glibc2 */ -#define wxUSE_DYNAMIC_LOADER 0 - +#define wxHAVE_GLIBC2 0 /* - * Use wxTimer + * Use libXpm */ -#define wxUSE_TIMER 1 - +#define wxHAVE_LIB_XPM 1 /* - * Use font metric files in GetTextExtent for wxPostScriptDC * Use consistent PostScript fonts for AFM and printing (!) */ -#define wxUSE_AFM_FOR_POSTSCRIPT 1 #define wxUSE_NORMALIZED_PS_FONTS 1 /* compatibility */ #define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS /* - * Use PostScript device context - */ -#define wxUSE_POSTSCRIPT 1 - -/* - * Compile wxString with some Unicode (wide character) support? - */ -#define wxUSE_WCHAR_T 1 - -/* - * Compile wxWindows in Unicode mode? - */ -#define wxUSE_UNICODE 0 - -/* - * Use MS Layer for Unicode on Win9X (Win32 only)? + * Use OpenGL */ -#define wxUSE_UNICODE_MSLU 0 +#define wxUSE_OPENGL 1 /* * Set to 1 to compile MS Windows XP theme engine support @@ -776,21 +646,6 @@ */ /* #define wxUSE_UXTHEME_AUTO 1*/ -/* - * Set to 1 to use mousewheel events on Windows - */ -/* #undef wxUSE_MOUSEWHEEL */ - -/* - * Hotkey support (Windows) - */ -/* #define wxUSE_HOTKEY 1 */ - -/* - * Use wxURL class - */ -#define wxUSE_URL 1 - /* * Work around a bug in GNU libc 5.x wcstombs() implementation. * @@ -807,72 +662,14 @@ */ #define wxUSE_EXPERIMENTAL_PRINTF 0 -/* - * Use Interprocess communication - */ -#define wxUSE_IPC 1 /* * Use wxGetResource & wxWriteResource (change .Xdefaults) */ #define wxUSE_X_RESOURCES 1 -/* - * Use clipboard - */ -#define wxUSE_CLIPBOARD 1 -/* - * Use wxDataObject -*/ -#define wxUSE_DATAOBJ 1 -/* - * Use tooltips - */ -#if defined (__WXMOTIF__) || defined( __WXX11__ ) -#define wxUSE_TOOLTIPS 0 -#else -#define wxUSE_TOOLTIPS 1 -#endif -/* - * Use dnd - */ -#ifdef __WXGTK__ -#define wxUSE_DRAG_AND_DROP 1 -#else -#define wxUSE_DRAG_AND_DROP 0 -#endif /* * Use OLE (MSW only) -*/ -#define wxUSE_OLE 0 -/* - * Use spline - */ -#define wxUSE_SPLINES 1 - -/* - * Use MDI. */ -#define wxUSE_MDI 1 -/* - * Use the mdi architecture - */ -#define wxUSE_MDI_ARCHITECTURE 1 -/* - * Use the document/view architecture - */ -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 -/* - * Use the print/preview architecture - */ -#define wxUSE_PRINTING_ARCHITECTURE 1 - -/* - * Use Prolog IO - */ -#define wxUSE_PROLOGIO 1 -/* - * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1) - */ -#define wxUSE_RESOURCES 1 +#define wxUSE_OLE 0 /* for compatibility */ #define wxUSE_WX_RESOURCES wxUSE_RESOURCES @@ -894,155 +691,16 @@ */ #define wxUSE_LIBMSPACK 1 -/* - * Use iostream.h rather than iostream - */ -#define wxUSE_IOSTREAMH 1 -/* - * Use Apple Ieee-double converter - */ -#define wxUSE_APPLE_IEEE 0 - -/* - * Compatibility with 2.2 API - */ -#define WXWIN_COMPATIBILITY_2_2 1 -/* - * Compatibility with 2.4 API - */ -#define WXWIN_COMPATIBILITY_2_4 1 -/* - * Enables debugging: memory tracing, assert, etc., contains debug level - */ -#define WXDEBUG 0 -/* - * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) - * WARNING: this code may not work with all architectures, especially - * if alignment is an issue. - */ -#define wxUSE_MEMORY_TRACING 0 -/* - * Enable debugging version of global memory operators new and delete - * Disable it, If this causes problems (e.g. link errors) - */ -#define wxUSE_DEBUG_NEW_ALWAYS 0 -/* - * VZ: What does this one do? (FIXME) - */ -#define wxUSE_DEBUG_CONTEXT 0 -/* - * In debug mode, causes new to be defined to - * be WXDEBUG_NEW (see object.h). If this causes - * problems (e.g. link errors), set this to 0. - */ -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 /* * Matthews garbage collection (used for MrEd?) */ #define WXGARBAGE_COLLECTION_ON 1 -/* - * Use splines - */ -#define wxUSE_SPLINES 1 -/* - * wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port - */ -#define wxUSE_DYNAMIC_CLASSES 1 - -/* - * Support for metafiles - */ -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 - -/* - * wxMiniFrame - */ -#define wxUSE_MINIFRAME 1 - -/* - * wxHTML - */ -#define wxUSE_HTML 1 - -/* - * wxXRC - */ -#define wxUSE_XRC 1 /* * wxWebKitCtrl */ #define wxUSE_WEBKIT 1 -/* - * (virtual) filesystems code - */ -#define wxUSE_FILESYSTEM 1 -#define wxUSE_FS_INET 1 -#define wxUSE_FS_ZIP 1 - -/* - * A class that shows info window when app is busy - * (works exactly like wxBusyCursor) - */ -#define wxUSE_BUSYINFO 1 - -/* - * Zip stream for accessing files stored inside .zip archives - */ -#define wxUSE_ZIPSTREAM 1 - -/* - * wxPalette class - */ -#define wxUSE_PALETTE 1 - -/* - * wxImage support - */ -#define wxUSE_IMAGE 1 - -/* - * GIF image format support - */ -#define wxUSE_GIF 1 - -/* - * PCX image format support - */ -#define wxUSE_PCX 1 - -/* - * IFF image format support - */ -#define wxUSE_IFF 1 - -/* - * PNM image format support - */ -#define wxUSE_PNM 1 - -/* - * XPM image format support - */ -#define wxUSE_XPM 1 - -/* - * MS ICO (and CUR,ANI derivatives) image format support (on any platform) - */ -#define wxUSE_ICO_CUR 1 - -/* - * Set to 1 if for dynamically loadable plugins support - */ -#define wxUSE_PLUGINS 1 - -/* - * Disable this if your compiler can't cope - * with omission of prototype parameters. - */ -#define REMOVE_UNUSED_ARG 1 /* * The const keyword is being introduced more in wxWindows. * You can use this setting to maintain backward compatibility. @@ -1082,6 +740,9 @@ /* Define if you have pw_gecos field in struct passwd */ #undef HAVE_PW_GECOS +/* Define if you have __cxa_demangle() in */ +#undef HAVE_CXA_DEMANGLE + /* Define if you have dlopen() */ #define HAVE_DLOPEN 1 diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 5ac8039ba8..6d6bc44b6f 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -77,6 +77,7 @@ OBJECTS = \ encconv.obj,\ event.obj,\ extended.obj,\ + fddlgcmn.obj,\ ffile.obj,\ file.obj,\ fileconf.obj,\ @@ -217,6 +218,7 @@ SOURCES = \ event.cpp,\ extended.c,\ ffile.cpp,\ + fddlgcmn.cpp,\ file.cpp,\ fileconf.cpp,\ filename.cpp,\ @@ -390,6 +392,7 @@ encconv.obj : encconv.cpp event.obj : event.cpp extended.obj : extended.c ffile.obj : ffile.cpp +fddlgcmn.obj : fddlgcmn.cpp file.obj : file.cpp fileconf.obj : fileconf.cpp filefn.obj : filefn.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 3ae317bf36..fd9489e653 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -43,9 +43,11 @@ OBJECTS = \ caret.obj,\ choicdgg.obj,\ colrdlgg.obj,\ + datectlg.obj,\ dcpsg.obj,\ dirctrlg.obj,\ dirdlgg.obj,\ + fdrepdlg.obj,\ fontdlgg.obj,\ grid.obj,\ gridctrl.obj,\ @@ -79,10 +81,12 @@ SOURCES = \ caret.cpp,\ choicdgg.cpp,\ colrdlgg.cpp,\ + datectlg.cpp,\ dcpsg.cpp,\ dirctrlg.cpp,\ dirdlgg.cpp,\ filedlgg.cpp,\ + fdrepdlg.cpp,\ fontdlgg.cpp,\ grid.cpp,\ gridctrl.cpp,\ @@ -156,11 +160,13 @@ calctrl.obj : calctrl.cpp caret.obj : caret.cpp choicdgg.obj : choicdgg.cpp colrdlgg.obj : colrdlgg.cpp +datectlg.obj : datectlg.cpp dcpsg.obj : dcpsg.cpp dirctrlg.obj : dirctrlg.cpp dirdlgg.obj : dirdlgg.cpp filedlgg.obj : filedlgg.cpp fontdlgg.obj : fontdlgg.cpp +fdrepdlg.obj : fdrepdlg.cpp grid.obj : grid.cpp gridctrl.obj : gridctrl.cpp gridsel.obj : gridsel.cpp diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index abeea67e0a..10f7ee30ff 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -40,6 +40,7 @@ CC_DEFINE = OBJECTS = baseunix.obj,\ dialup.obj,\ dir.obj,\ + dlunix.obj,\ fontenum.obj,\ fontutil.obj,\ gsocket.obj,\ @@ -57,6 +58,7 @@ OBJECTS = baseunix.obj,\ SOURCES = baseunix.cpp,\ dialup.cpp,\ dir.cpp,\ + dlunix.cpp,\ fontenum.cpp,\ fontutil.cpp,\ gsocket.cpp,\ @@ -88,6 +90,7 @@ all : $(SOURCES) baseunix.obj : baseunix.cpp dialup.obj : dialup.cpp dir.obj : dir.cpp +dlunix.obj : dlunix.cpp fontenum.obj : fontenum.cpp fontutil.obj : fontutil.cpp gsocket.obj : gsocket.cpp -- 2.45.2