Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Browse Source
This commit is contained in:
Jouk Jansen
2007-09-25 14:39:47 +00:00
parent 58fda45507
commit 934960d133
11 changed files with 126 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
descrip.mms
View File

@@ -2,7 +2,7 @@
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 19 April 2007 *
# Date : 5 September 2007 *
# *
#*****************************************************************************
.first
@@ -61,8 +61,6 @@ gtk : [.include.wx]setup.h
$(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]
@@ -125,8 +123,6 @@ gtk2 : [.include.wx]setup.h
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)
@@ -191,8 +187,6 @@ x11 : [.include.wx]setup.h
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)
@@ -248,8 +242,6 @@ motif : [.include.wx]setup.h
$(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]

8
include/wx/confbase.h
View File

@@ -185,8 +185,8 @@ public:
// 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
@@ -294,8 +294,8 @@ public:
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)

14
include/wx/wxcrtvararg.h
View File

@@ -224,12 +224,26 @@
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

177
setup.h_vms
View File

@@ -3,7 +3,7 @@
* 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 *
* *
*****************************************************************************/
@@ -167,7 +167,7 @@ typedef pid_t GPid;
#endif
#define WXWIN_COMPATIBILITY_2_6 0
#define WXWIN_COMPATIBILITY_2_6 1
#define WXWIN_COMPATIBILITY_2_8 1
@@ -191,8 +191,12 @@ typedef pid_t GPid;
#ifndef wxUSE_UNICODE
#if defined( __WXX11__ )
#define wxUSE_UNICODE 0
#else
#define wxUSE_UNICODE 1
#endif
#endif
#define wxUSE_WCHAR_T 1
@@ -230,6 +234,10 @@ typedef pid_t GPid;
#define wxUSE_LONGLONG 1
#define wxUSE_BASE64 1
#define wxUSE_CONSOLE_EVENTLOOP 0
#define wxUSE_FILE 1
#define wxUSE_FFILE 1
@@ -283,6 +291,8 @@ typedef pid_t GPid;
#define wxUSE_JOYSTICK 0
#define wxUSE_FONTENUM 1
#define wxUSE_FONTMAP 1
#define wxUSE_MIMETYPE 1
@@ -345,6 +355,7 @@ typedef pid_t GPid;
#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
@@ -389,6 +400,8 @@ typedef pid_t GPid;
#define wxUSE_TAB_DIALOG 1
#define wxUSE_TASKBARICON 1
#define wxUSE_GRID 1
#define wxUSE_MINIFRAME 1
@@ -517,6 +530,8 @@ typedef pid_t GPid;
#define wxUSE_AFM_FOR_POSTSCRIPT 1
#define wxUSE_SVG 1
#define wxUSE_ODBC 1
#define wxODBC_FWD_ONLY_CURSORS 1
@@ -563,34 +578,60 @@ typedef pid_t GPid;
/* --- 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
/* 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
#endif
#define wxUSE_INKEDIT 1
#define wxUSE_UNICODE_MSLU 0
/*
* Unix/VMS-specific options
*/
#define wxUSE_SELECT_DISPATCHER 1
#define wxUSE_EPOLL_DISPATCHER 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_MFC 0
#define wxUSE_OLE 0
#define wxUSE_OLE_AUTOMATION 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
@@ -679,6 +720,11 @@ typedef pid_t GPid;
*/
#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
@@ -697,7 +743,11 @@ typedef pid_t GPid;
/*
* 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
*/
@@ -733,18 +783,6 @@ typedef pid_t GPid;
*/
#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
@@ -840,12 +878,6 @@ typedef pid_t GPid;
/* 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
@@ -874,18 +906,9 @@ typedef pid_t GPid;
/* 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
@@ -911,10 +934,6 @@ typedef pid_t GPid;
#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
@@ -940,9 +959,6 @@ typedef pid_t GPid;
/* 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
@@ -968,14 +984,11 @@ typedef pid_t GPid;
#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
@@ -1006,9 +1019,6 @@ typedef pid_t GPid;
/* 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
@@ -1099,26 +1109,6 @@ typedef pid_t GPid;
#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
@@ -1165,12 +1155,6 @@ typedef pid_t GPid;
/* 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
@@ -1186,14 +1170,6 @@ typedef pid_t GPid;
/* 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
@@ -1221,9 +1197,6 @@ typedef pid_t GPid;
/* 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

9
src/common/descrip.mms
View File

@@ -2,7 +2,7 @@
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 23 May 2007 *
# Date : 12 September 2007 *
# *
#*****************************************************************************
.first
@@ -58,6 +58,7 @@ OBJECTS = \
arrstr.obj,\
artprov.obj,\
artstd.obj,\
base64.obj,\
bmpbase.obj,\
btncmn.obj,\
bookctrl.obj,\
@@ -178,7 +179,7 @@ OBJECTS1=fs_inet.obj,\
strvararg.obj,\
sysopt.obj
OBJECTS2=tbarbase.obj,\
OBJECTS2=tbarbase.obj,srchcmn.obj,\
textbuf.obj,\
textcmn.obj,\
textfile.obj,\
@@ -231,6 +232,7 @@ SOURCES = \
arrstr.cpp,\
artprov.cpp,\
artstd.cpp,\
base64.cpp,\
bmpbase.cpp,\
btncmn.cpp,\
bookctrl.cpp,\
@@ -349,6 +351,7 @@ SOURCES = \
stdpbase.cpp,\
stockitem.cpp,\
stopwatch.cpp,\
srchcmn.cpp,\
strconv.cpp,\
stream.cpp,\
strvararg.cpp,\
@@ -449,6 +452,7 @@ appcmn.obj : appcmn.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
@@ -619,3 +623,4 @@ filepickercmn.obj : filepickercmn.cpp
fontpickercmn.obj : fontpickercmn.cpp
pickerbase.obj : pickerbase.cpp
listctrlcmn.obj : listctrlcmn.cpp
srchcmn.obj : srchcmn.cpp

2
src/gtk1/listbox.cpp
View File

@@ -600,7 +600,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
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);

6
src/gtk1/utilsres.cpp
View File

@@ -91,7 +91,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
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;
}
@@ -104,7 +104,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
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;
}
@@ -117,7 +117,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
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;
}

3
src/gtk1/window.cpp
View File

@@ -927,7 +927,10 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
event.m_rawCode = (wxUint32) gdk_event->keyval;
event.m_rawFlags = 0;
#if wxUSE_UNICODE
#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 );

4
src/unix/appunix.cpp
View File

@@ -78,7 +78,11 @@ bool wxAppConsole::SetSignalHandler(int signal, SignalHandler handler)
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = (SignalHandler_t)&wxAppConsole::HandleSignal;
#ifdef __VMS
sa.sa_flags = 0;
#else
sa.sa_flags = SA_RESTART;
#endif
int res = sigaction(signal, &sa, 0);
if ( res != 0 )
{

7
src/unix/descrip.mms
View File

@@ -2,7 +2,7 @@
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 24 April 2007 *
# Date : 5 September 2007 *
# *
#*****************************************************************************
.first
@@ -43,7 +43,7 @@ CC_DEFINE =
.c.obj :
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
OBJECTS = baseunix.obj,\
OBJECTS = appunix.obj,baseunix.obj,\
dialup.obj,\
dir.obj,\
displayx11.obj,\
@@ -63,7 +63,7 @@ OBJECTS = baseunix.obj,\
taskbarx11.obj,\
timerunx.obj
SOURCES = baseunix.cpp,\
SOURCES = appunix.cpp,baseunix.cpp,\
dialup.cpp,\
dir.cpp,\
displayx11.cpp,\
@@ -101,6 +101,7 @@ all : $(SOURCES)
.endif
.endif
appunix.obj : appunix.cpp
baseunix.obj : baseunix.cpp
dialup.obj : dialup.cpp
dir.obj : dir.cpp

10
src/xrc/descrip.mms
View File

@@ -2,7 +2,7 @@
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 9 November 2006 *
# Date : 12 September 2007 *
# *
#*****************************************************************************
.first
@@ -54,7 +54,8 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
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,\
@@ -67,7 +68,8 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.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)
@@ -142,3 +144,5 @@ xh_bmpcbox.obj : xh_bmpcbox.cpp
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