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

OpenVMS changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2007-05-16 10:04:24 +00:00
parent 729b47568a
commit 0f0223d38a
6 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
descrip.mms
View File

@@ -236,7 +236,6 @@ motif : [.include.wx]setup.h
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.aui]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.motif]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

8
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 : 17 April 2007 *
* Date : 16 May 2007 *
* *
*****************************************************************************/
@@ -343,6 +343,7 @@ typedef pid_t GPid;
#define wxUSE_DATAVIEWCTRL 1
#define wxUSE_DATEPICKCTRL 1
#define wxUSE_DIRPICKERCTRL 1
#define wxUSE_EDITABLELISTBOX 1
#define wxUSE_FILEPICKERCTRL 1
#define wxUSE_FONTPICKERCTRL 1
#define wxUSE_GAUGE 1
@@ -591,6 +592,8 @@ typedef pid_t GPid;
#define wxUSE_UNICODE_UTF8 0
#define wxUSE_UTF8_LOCALE_ONLY 0
#define wxUSE_DC_CACHEING 1
#define wxUSE_GADGETS 1
@@ -1236,6 +1239,9 @@ 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

5
src/common/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 : 24 April 2007 *
# *
#*****************************************************************************
.first
@@ -182,6 +182,7 @@ OBJECTS2=tbarbase.obj,\
textcmn.obj,\
textfile.obj,\
timercmn.obj,\
timerimpl.obj,\
tokenzr.obj,\
toplvcmn.obj,\
treebase.obj,\
@@ -354,6 +355,7 @@ SOURCES = \
textcmn.cpp,\
textfile.cpp,\
timercmn.cpp,\
timerimpl.cpp,\
tokenzr.cpp,\
toplvcmn.cpp,\
treebase.cpp,\
@@ -566,6 +568,7 @@ textbuf.obj : textbuf.cpp
textcmn.obj : textcmn.cpp
textfile.obj : textfile.cpp
timercmn.obj : timercmn.cpp
timerimpl.obj : timerimpl.cpp
tokenzr.obj : tokenzr.cpp
toplvcmn.obj : toplvcmn.cpp
treebase.obj : treebase.cpp

11
src/gtk1/utilsgtk.cpp
View File

@@ -215,3 +215,14 @@ void wxGUIAppTraits::SetLocale()
}
#endif
wxString
wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
wxArrayString& desc) const
{
wxString usage;
wxUnusedVar(names);
wxUnusedVar(desc);
return usage;
}

9
src/unix/descrip.mms
View File

@@ -2,7 +2,7 @@
# *
# Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 13 February 2006 *
# Date : 24 April 2007 *
# *
#*****************************************************************************
.first
@@ -60,7 +60,8 @@ OBJECTS = baseunix.obj,\
sound.obj,\
sound_sdl.obj,\
stdpaths.obj,\
taskbarx11.obj
taskbarx11.obj,\
timerunx.obj
SOURCES = baseunix.cpp,\
dialup.cpp,\
@@ -79,7 +80,8 @@ SOURCES = baseunix.cpp,\
sound.cpp,\
sound_sdl.cpp,\
stdpaths.cpp,\
taskbarx11.cpp
taskbarx11.cpp,\
timerunx.cpp
all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -118,3 +120,4 @@ sound_sdl.obj : sound_sdl.cpp
stdpaths.obj : stdpaths.cpp
taskbarx11.obj : taskbarx11.cpp
displayx11.obj : displayx11.cpp
timerunx.obj : timerunx.cpp

2
src/x11/bitmap.cpp
View File

@@ -1359,7 +1359,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
Pixmap mask = 0;
int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
(char*) name.c_str(),
(char*) ((const char*) name.c_str()),
&pixmap, &mask, &xpmAttr);
if (ErrorStatus == XpmSuccess)