# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
-# Date : 19 April 2007 *
+# Date : 5 September 2007 *
# *
#*****************************************************************************
.first
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.caret]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
- set default [-.checklst]
- $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.config]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.controls]
set default [--.samples.calendar]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [-.caret]
-# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
- set default [-.checklst]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [-.config]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [--.samples.calendar]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.caret]
-# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
- set default [-.checklst]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.config]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
set default [-.caret]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
- set default [-.checklst]
- $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
set default [-.config]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
set default [-.dialogs]
// no default version since it does not make sense for binary data
#endif // wxUSE_BASE64
- // Causes ambiguities in VC++ 6 (at least)
-#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
+ // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
// read other types, for which wxFromString is defined
template <typename T>
bool Read(const wxString& key, T* value) const
bool Write(const wxString& key, float value)
{ return DoWriteDouble(key, value); }
- // Causes ambiguities in VC++ 6 (at least)
-#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
+ // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
// for other types, use wxToString()
template <typename T>
bool Write(const wxString& key, T const& value)
int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...);
int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...);
int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap);
+#else
+#ifdef __VMS
+#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
+# define wxCRT_ScanfW std::wscanf
+# define wxCRT_SscanfW std::swscanf
+# define wxCRT_FscanfW std::fwscanf
+# define wxCRT_VsscanfW std::vswscanf
+#else
+ #define wxCRT_ScanfW wscanf
+ #define wxCRT_SscanfW swscanf
+ #define wxCRT_FscanfW fwscanf
+ #define wxCRT_VsscanfW vswscanf
+#endif
#else
#define wxCRT_ScanfW wscanf
#define wxCRT_SscanfW swscanf
#define wxCRT_FscanfW fwscanf
#define wxCRT_VsscanfW vswscanf
#endif
+#endif
// ----------------------------------------------------------------------------
// user-friendly wrappers to CRT functions
* Template for the set.h file for VMS *
* Created from setup.h_in *
* Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
- * Date : 3 July 2007 *
+ * Date : 25 September 2007 *
* *
*****************************************************************************/
#endif
-#define WXWIN_COMPATIBILITY_2_6 0
+#define WXWIN_COMPATIBILITY_2_6 1
#define WXWIN_COMPATIBILITY_2_8 1
#ifndef wxUSE_UNICODE
+#if defined( __WXX11__ )
+ #define wxUSE_UNICODE 0
+#else
#define wxUSE_UNICODE 1
#endif
+#endif
#define wxUSE_WCHAR_T 1
#define wxUSE_LONGLONG 1
+#define wxUSE_BASE64 1
+
+#define wxUSE_CONSOLE_EVENTLOOP 0
+
#define wxUSE_FILE 1
#define wxUSE_FFILE 1
#define wxUSE_JOYSTICK 0
+#define wxUSE_FONTENUM 1
+
#define wxUSE_FONTMAP 1
#define wxUSE_MIMETYPE 1
#define wxUSE_DATEPICKCTRL 1
#define wxUSE_DIRPICKERCTRL 1
#define wxUSE_EDITABLELISTBOX 1
+#define wxUSE_FILECTRL 1
#define wxUSE_FILEPICKERCTRL 1
#define wxUSE_FONTPICKERCTRL 1
#define wxUSE_GAUGE 1
#define wxUSE_TAB_DIALOG 1
+#define wxUSE_TASKBARICON 1
+
#define wxUSE_GRID 1
#define wxUSE_MINIFRAME 1
#define wxUSE_AFM_FOR_POSTSCRIPT 1
+#define wxUSE_SVG 1
+
#define wxUSE_ODBC 1
#define wxODBC_FWD_ONLY_CURSORS 1
/* --- end common options --- */
-/* for some features we don't have dedicated configure switches, so just choose
- * the common values automatically */
-#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
-#else
-#define wxUSE_OWNER_DRAWN 0
-#endif
+/*
+ * Unix/VMS-specific options
+ */
+#define wxUSE_SELECT_DISPATCHER 1
+#define wxUSE_EPOLL_DISPATCHER 0
-/* enable rich edit under Win32 */
-#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT 1
-#define wxUSE_RICHEDIT2 1
-#else
-#define wxUSE_RICHEDIT 0
-#define wxUSE_RICHEDIT2 0
+#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
+/* --- start MSW options --- */
+
+#ifndef wxUSE_UNICODE_MSLU
+ #define wxUSE_UNICODE_MSLU 0
#endif
-#define wxUSE_INKEDIT 1
+#define wxUSE_MFC 0
-#define wxUSE_UNICODE_MSLU 0
+#define wxUSE_OLE 0
-#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_OLE_AUTOMATION 0
-#define wxUSE_UTF8_LOCALE_ONLY 0
+#define wxUSE_ACTIVEX 0
#define wxUSE_DC_CACHEING 1
-#define wxUSE_GADGETS 1
+#define wxUSE_WXDIB 0
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+
+#define wxUSE_REGKEY 0
+
+#define wxUSE_RICHEDIT 0
+
+#define wxUSE_RICHEDIT2 0
+
+#define wxUSE_OWNER_DRAWN 0
+
+#define wxUSE_UXTHEME 0
+
+#define wxUSE_INKEDIT 0
+
+#define wxUSE_INICONF 0
+
+
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+
+#define wxUSE_CRASHREPORT 0
+
+
+
+#define wxUSE_BITMAP_MESSAGE 0
+
+/* --- end MSW options --- */
/*
* Supports bool type
*/
#undef HAVE_GCC_ATOMIC_BUILTINS
+/*
+ * Define if compiler's visibility support in libstdc++ is broken
+ */
+#undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY
+
/*
* 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
/*
* Use GTK print for printing under GTK+ 2.0
*/
+#ifdef VMS_GTK2
+#define wxUSE_GTKPRINT 1
+#else
#define wxUSE_GTKPRINT 0
+#endif
/*
* Use GNOME print for printing under GTK+ 2.0
*/
*/
#define wxUSE_OPENGL 1
-/*
- * Set to 1 to compile MS Windows XP theme engine support
- */
-/* #define wxUSE_UXTHEME 1 */
-
-/*
- * Use OLE and OLE Automation (MSW only)
- */
-#define wxUSE_OLE 0
-#define wxUSE_OLE_AUTOMATION 0
-#define wxUSE_ACTIVEX 0
-
/* for compatibility */
/*
* Use wxWindows help facility
/* Define if you have ftime() */
#define HAVE_FTIME
-/* Define if you have support for large (64 bit size) files */
-#undef HAVE_LARGEFILE_SUPPORT
-
-/* Define if you have localtime() */
-#define HAVE_LOCALTIME
-
/* Define if you have nanosleep() */
#if __CRTL_VER >= 70320000
#define HAVE_NANOSLEEP 1
/* Define if you have pthread_attr_setstacksize */
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-/* Define if you have sigaction() */
-#define HAVE_SIGACTION 1
-
-/* Define if you have sigemptyset() */
-#define HAVE_SIGEMPTYSET 1
-
/* Define if you have the putenv function. */
#define HAVE_PUTENV 1
-/* Define if you have the readdir_r function. */
-#undef HAVE_READDIR_R
-
/* Define if you have the setenv function. */
# if __CRTL_VER >= 70000000
#define HAVE_SETENV 1
#undef HAVE_SNPRINTF_DECL
#endif
-/* Define if you have a _broken_ snprintf() declaration in the header,
- * with 'char*' for the 3rd parameter instead of 'const char*' */
-#undef HAVE_BROKEN_SNPRINTF_DECL
-
/* Define if you have a snprintf() which supports positional arguments
(defined in the unix98 standard) */
#undef HAVE_UNIX98_PRINTF
/* Define if you have all functions to set thread priority */
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-/* Define if you have timegm() function */
-#undef HAVE_TIMEGM
-
#if __CRTL_VER >= 70312000
/* Define if you have vsnprintf() */
#define HAVE_VSNPRINTF 1
#define HAVE_WCSLEN 1
/* Define if you have wcsdup function */
-#define HAVE_WCSDUP 0
+#undef HAVE_WCSDUP
/* Define if you have wcstoull() and wcstoll() */
#undef HAVE_WCSTOULL
-/* define if you have vsscanf function */
-#undef HAVE_VSSCANF
-
/* The number of bytes in a wchar_t. */
#define SIZEOF_WCHAR_T 4
/* Define if wchar_t is distinct type in your compiler. */
#define wxWCHAR_T_IS_REAL_TYPE 1
-/* Define if you have the dlopen function. */
-#define HAVE_DLOPEN 1
-
/* Define if you have the dlerror function. */
#define HAVE_DLERROR 1
#undef HAVE_X11_XKBLIB_H
#endif
-/* Define if you have the fnmatch() function */
-#if __CRTL_VER >= 70320000
-#define HAVE_FNMATCH 1
-#else
-#undef HAVE_FNMATCH
-#endif
-
-/* Define if you have the <fnmatch.h> header file. */
-#if __CRTL_VER >= 70320000
-#define HAVE_FNMATCH_H 1
-#else
-#undef HAVE_FNMATCH_H
-#endif
-
-/* Define if you have the <iostream> header file. */
-#undef HAVE_IOSTREAM
-
-/* Define if you have the <linux/joystick.h> header file. */
-#undef HAVE_LINUX_JOYSTICK_H
-
/* Define if you have the <sched.h> header file. */
#undef HAVE_SCHED_H
/* Define if you have wcsrtombs() function */
#define HAVE_WCSRTOMBS 1
-/* Define this if you have wputc() */
-#define HAVE_WPUTC 1
-
-/* Define this if you have wputchar() */
-#define HAVE_WPUTCHAR 1
-
/* Define this if you have putws() */
#undef HAVE_PUTWS
/* Define this if you have wprintf() and related functions */
#define HAVE_WPRINTF 1
-
-/* Define this if you have swprintf() */
-#define HAVE_SWPRINTF 1
-
-/* Define if you have a _broken_ swprintf() declaration in the header,
- * without a 'size_t max' parameter as second argument */
-#undef HAVE_BROKEN_SWPRINTF_DECL
-
/* Define this if you have vswprintf() and related functions */
#define HAVE_VSWPRINTF 1
/* Define if you have Pango xft support */
#undef HAVE_PANGO_XFT
-/* Define if you have the <sys/epoll.h> header file. */
-#undef HAVE_SYS_EPOLL_H
-
/* Define if fdopen is available. */
#define HAVE_FDOPEN 1
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
-# Date : 23 May 2007 *
+# Date : 12 September 2007 *
# *
#*****************************************************************************
.first
arrstr.obj,\
artprov.obj,\
artstd.obj,\
+ base64.obj,\
bmpbase.obj,\
btncmn.obj,\
bookctrl.obj,\
strvararg.obj,\
sysopt.obj
-OBJECTS2=tbarbase.obj,\
+OBJECTS2=tbarbase.obj,srchcmn.obj,\
textbuf.obj,\
textcmn.obj,\
textfile.obj,\
arrstr.cpp,\
artprov.cpp,\
artstd.cpp,\
+ base64.cpp,\
bmpbase.cpp,\
btncmn.cpp,\
bookctrl.cpp,\
stdpbase.cpp,\
stockitem.cpp,\
stopwatch.cpp,\
+ srchcmn.cpp,\
strconv.cpp,\
stream.cpp,\
strvararg.cpp,\
arrstr.obj : arrstr.cpp
artprov.obj : artprov.cpp
artstd.obj : artstd.cpp
+base64.obj : base64.cpp
bmpbase.obj : bmpbase.cpp
btncmn.obj : btncmn.cpp
bookctrl.obj : bookctrl.cpp
fontpickercmn.obj : fontpickercmn.cpp
pickerbase.obj : pickerbase.cpp
listctrlcmn.obj : listctrlcmn.cpp
+srchcmn.obj : srchcmn.cpp
const unsigned idx = m_strings ? m_strings->Add(item)
: pos;
- GtkAddItem(item, idx == GetCount() ? -1 : idx);
+ GtkAddItem(item, idx == GetCount() ? (unsigned) -1 : idx);
m_clientList.Insert(idx, NULL);
bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
if (succ)
{
- *value = (float)wxStrtod(s, NULL);
+ *value = (float)wxStrtod(s, (wchar_t **) NULL);
delete[] s;
return true;
}
bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
if (succ)
{
- *value = wxStrtol(s, NULL, 10);
+ *value = wxStrtol(s, (wchar_t **) NULL, 10);
delete[] s;
return true;
}
bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
if (succ)
{
- *value = (int)wxStrtol(s, NULL, 10);
+ *value = (int)wxStrtol(s, (wchar_t **) NULL, 10);
delete[] s;
return true;
}
event.m_rawCode = (wxUint32) gdk_event->keyval;
event.m_rawFlags = 0;
#if wxUSE_UNICODE
- event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
+#if 0
+ // this is not gtk1.x
+ event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
+#endif
#endif
wxGetMousePosition( &x, &y );
win->ScreenToClient( &x, &y );
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = (SignalHandler_t)&wxAppConsole::HandleSignal;
- sa.sa_flags = SA_RESTART;
- int res = sigaction(signal, &sa, 0);
+#ifdef __VMS
+ sa.sa_flags = 0;
+#else
+ sa.sa_flags = SA_RESTART;
+#endif
+ int res = sigaction(signal, &sa, 0);
if ( res != 0 )
{
wxLogSysError(_("Failed to install signal handler"));
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
-# Date : 24 April 2007 *
+# Date : 5 September 2007 *
# *
#*****************************************************************************
.first
.c.obj :
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-OBJECTS = baseunix.obj,\
+OBJECTS = appunix.obj,baseunix.obj,\
dialup.obj,\
dir.obj,\
displayx11.obj,\
taskbarx11.obj,\
timerunx.obj
-SOURCES = baseunix.cpp,\
+SOURCES = appunix.cpp,baseunix.cpp,\
dialup.cpp,\
dir.cpp,\
displayx11.cpp,\
.endif
.endif
+appunix.obj : appunix.cpp
baseunix.obj : baseunix.cpp
dialup.obj : dialup.cpp
dir.obj : dir.cpp
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
-# Date : 9 November 2006 *
+# Date : 12 September 2007 *
# *
#*****************************************************************************
.first
xh_choicbk.obj,xh_dirpicker.obj,xh_hyperlink.obj,xh_filepicker.obj,\
xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
- xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj
+ xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\
+ xh_propdlg.obj
SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
xh_choicbk.cpp,xh_dirpicker.cpp,xh_hyperlink.cpp,xh_filepicker.cpp,\
xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
- xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp
+ xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\
+ xh_propdlg.cpp
all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
xh_animatctrl.obj : xh_animatctrl.cpp
xh_htmllbox.obj : xh_htmllbox.cpp
xh_collpane.obj : xh_collpane.cpp
+xh_srchctrl.obj : xh_srchctrl.cpp
+xh_propdlg.obj : xh_propdlg.cpp
projects / wxWidgets.git / commitdiff
