OpenVMS changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -236,7 +236,6 @@ motif : [.include.wx]setup.h
|
|||||||
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
|
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
|
||||||
set default [-.aui]
|
set default [-.aui]
|
||||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
|
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
|
||||||
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
|
|
||||||
set default [-.motif]
|
set default [-.motif]
|
||||||
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
|
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
|
||||||
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
|
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
* Template for the set.h file for VMS *
|
* Template for the set.h file for VMS *
|
||||||
* Created from setup.h_in *
|
* Created from setup.h_in *
|
||||||
* Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
* 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_DATAVIEWCTRL 1
|
||||||
#define wxUSE_DATEPICKCTRL 1
|
#define wxUSE_DATEPICKCTRL 1
|
||||||
#define wxUSE_DIRPICKERCTRL 1
|
#define wxUSE_DIRPICKERCTRL 1
|
||||||
|
#define wxUSE_EDITABLELISTBOX 1
|
||||||
#define wxUSE_FILEPICKERCTRL 1
|
#define wxUSE_FILEPICKERCTRL 1
|
||||||
#define wxUSE_FONTPICKERCTRL 1
|
#define wxUSE_FONTPICKERCTRL 1
|
||||||
#define wxUSE_GAUGE 1
|
#define wxUSE_GAUGE 1
|
||||||
@@ -591,6 +592,8 @@ typedef pid_t GPid;
|
|||||||
|
|
||||||
#define wxUSE_UNICODE_UTF8 0
|
#define wxUSE_UNICODE_UTF8 0
|
||||||
|
|
||||||
|
#define wxUSE_UTF8_LOCALE_ONLY 0
|
||||||
|
|
||||||
#define wxUSE_DC_CACHEING 1
|
#define wxUSE_DC_CACHEING 1
|
||||||
|
|
||||||
#define wxUSE_GADGETS 1
|
#define wxUSE_GADGETS 1
|
||||||
@@ -1236,6 +1239,9 @@ typedef pid_t GPid;
|
|||||||
/* Define if you have Pango xft support */
|
/* Define if you have Pango xft support */
|
||||||
#undef HAVE_PANGO_XFT
|
#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 if fdopen is available. */
|
||||||
#define HAVE_FDOPEN 1
|
#define HAVE_FDOPEN 1
|
||||||
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
# *
|
# *
|
||||||
# Make file for VMS *
|
# Make file for VMS *
|
||||||
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
||||||
# Date : 19 April 2007 *
|
# Date : 24 April 2007 *
|
||||||
# *
|
# *
|
||||||
#*****************************************************************************
|
#*****************************************************************************
|
||||||
.first
|
.first
|
||||||
@@ -182,6 +182,7 @@ OBJECTS2=tbarbase.obj,\
|
|||||||
textcmn.obj,\
|
textcmn.obj,\
|
||||||
textfile.obj,\
|
textfile.obj,\
|
||||||
timercmn.obj,\
|
timercmn.obj,\
|
||||||
|
timerimpl.obj,\
|
||||||
tokenzr.obj,\
|
tokenzr.obj,\
|
||||||
toplvcmn.obj,\
|
toplvcmn.obj,\
|
||||||
treebase.obj,\
|
treebase.obj,\
|
||||||
@@ -354,6 +355,7 @@ SOURCES = \
|
|||||||
textcmn.cpp,\
|
textcmn.cpp,\
|
||||||
textfile.cpp,\
|
textfile.cpp,\
|
||||||
timercmn.cpp,\
|
timercmn.cpp,\
|
||||||
|
timerimpl.cpp,\
|
||||||
tokenzr.cpp,\
|
tokenzr.cpp,\
|
||||||
toplvcmn.cpp,\
|
toplvcmn.cpp,\
|
||||||
treebase.cpp,\
|
treebase.cpp,\
|
||||||
@@ -566,6 +568,7 @@ textbuf.obj : textbuf.cpp
|
|||||||
textcmn.obj : textcmn.cpp
|
textcmn.obj : textcmn.cpp
|
||||||
textfile.obj : textfile.cpp
|
textfile.obj : textfile.cpp
|
||||||
timercmn.obj : timercmn.cpp
|
timercmn.obj : timercmn.cpp
|
||||||
|
timerimpl.obj : timerimpl.cpp
|
||||||
tokenzr.obj : tokenzr.cpp
|
tokenzr.obj : tokenzr.cpp
|
||||||
toplvcmn.obj : toplvcmn.cpp
|
toplvcmn.obj : toplvcmn.cpp
|
||||||
treebase.obj : treebase.cpp
|
treebase.obj : treebase.cpp
|
||||||
|
@@ -215,3 +215,14 @@ void wxGUIAppTraits::SetLocale()
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
wxString
|
||||||
|
wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
|
||||||
|
wxArrayString& desc) const
|
||||||
|
{
|
||||||
|
wxString usage;
|
||||||
|
|
||||||
|
wxUnusedVar(names);
|
||||||
|
wxUnusedVar(desc);
|
||||||
|
|
||||||
|
return usage;
|
||||||
|
}
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
# *
|
# *
|
||||||
# Make file for VMS *
|
# Make file for VMS *
|
||||||
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
||||||
# Date : 13 February 2006 *
|
# Date : 24 April 2007 *
|
||||||
# *
|
# *
|
||||||
#*****************************************************************************
|
#*****************************************************************************
|
||||||
.first
|
.first
|
||||||
@@ -60,7 +60,8 @@ OBJECTS = baseunix.obj,\
|
|||||||
sound.obj,\
|
sound.obj,\
|
||||||
sound_sdl.obj,\
|
sound_sdl.obj,\
|
||||||
stdpaths.obj,\
|
stdpaths.obj,\
|
||||||
taskbarx11.obj
|
taskbarx11.obj,\
|
||||||
|
timerunx.obj
|
||||||
|
|
||||||
SOURCES = baseunix.cpp,\
|
SOURCES = baseunix.cpp,\
|
||||||
dialup.cpp,\
|
dialup.cpp,\
|
||||||
@@ -79,7 +80,8 @@ SOURCES = baseunix.cpp,\
|
|||||||
sound.cpp,\
|
sound.cpp,\
|
||||||
sound_sdl.cpp,\
|
sound_sdl.cpp,\
|
||||||
stdpaths.cpp,\
|
stdpaths.cpp,\
|
||||||
taskbarx11.cpp
|
taskbarx11.cpp,\
|
||||||
|
timerunx.cpp
|
||||||
|
|
||||||
all : $(SOURCES)
|
all : $(SOURCES)
|
||||||
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
|
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
|
||||||
@@ -118,3 +120,4 @@ sound_sdl.obj : sound_sdl.cpp
|
|||||||
stdpaths.obj : stdpaths.cpp
|
stdpaths.obj : stdpaths.cpp
|
||||||
taskbarx11.obj : taskbarx11.cpp
|
taskbarx11.obj : taskbarx11.cpp
|
||||||
displayx11.obj : displayx11.cpp
|
displayx11.obj : displayx11.cpp
|
||||||
|
timerunx.obj : timerunx.cpp
|
||||||
|
@@ -1359,7 +1359,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
|
|||||||
Pixmap mask = 0;
|
Pixmap mask = 0;
|
||||||
|
|
||||||
int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
|
int ErrorStatus = XpmReadFileToPixmap( xdisplay, xroot,
|
||||||
(char*) name.c_str(),
|
(char*) ((const char*) name.c_str()),
|
||||||
&pixmap, &mask, &xpmAttr);
|
&pixmap, &mask, &xpmAttr);
|
||||||
|
|
||||||
if (ErrorStatus == XpmSuccess)
|
if (ErrorStatus == XpmSuccess)
|
||||||
|
Reference in New Issue
Block a user