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

wxMotif Solaris 2.6 compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-11 15:16:39 +00:00
parent 80cb83bef2
commit 1363811bb6
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/motif.inc
View File

@@ -122,11 +122,9 @@ LIB_CPP_SRC=\
motif/stattext.cpp \ motif/stattext.cpp \
motif/taskbar.cpp \ motif/taskbar.cpp \
motif/textctrl.cpp \ motif/textctrl.cpp \
motif/thread.cpp \
motif/timer.cpp \ motif/timer.cpp \
motif/toolbar.cpp \ motif/toolbar.cpp \
motif/utils.cpp \ motif/utils.cpp \
motif/utilsexc.cpp \
motif/wave.cpp \ motif/wave.cpp \
motif/window.cpp \ motif/window.cpp \
\ \
@@ -155,7 +153,9 @@ LIB_CPP_SRC=\
generic/statusbr.cpp \ generic/statusbr.cpp \
generic/tabg.cpp \ generic/tabg.cpp \
generic/textdlgg.cpp \ generic/textdlgg.cpp \
generic/treectrl.cpp generic/treectrl.cpp \
\
unix/utilsunx.cpp
LIB_C_SRC=\ LIB_C_SRC=\
\ \

14
src/motif/utils.cpp
View File

@@ -42,6 +42,8 @@
#include <Xm/Xm.h> #include <Xm/Xm.h>
#include "wx/unix/execute.h"
#include "wx/motif/private.h" #include "wx/motif/private.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -122,7 +124,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
// wxExecute stuff // wxExecute stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static void xt_notify_end_process(XtPointer client, int *fid, static void xt_notify_end_process(XtPointer data, int *fid,
XtInputId *id) XtInputId *id)
{ {
wxEndProcessData *proc_data = (wxEndProcessData *)data; wxEndProcessData *proc_data = (wxEndProcessData *)data;
@@ -141,7 +143,7 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
fd, fd,
(XtPointer *) XtInputReadMask, (XtPointer *) XtInputReadMask,
(XtInputCallbackProc) xt_notify_end_process, (XtInputCallbackProc) xt_notify_end_process,
(XtPointer) process_data); (XtPointer) proc_data);
return (int)id; return (int)id;
} }
@@ -461,11 +463,9 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
size_t len; size_t len;
environment = GetIniFile (filename, NULL); environment = GetIniFile (filename, NULL);
len = strlen (environment); len = strlen (environment);
#if defined(__SOLARIS__) || defined(__SVR4__) && !defined(__HPUX__) wxString hostname;
(void) sysinfo (SI_HOSTNAME, environment + len, 1024 - len); if ( wxGetHostName(hostname) )
#else strncat(environment, hostname, 1024 - len);
(void) gethostname (environment + len, 1024 - len);
#endif
} }
homeDB = XrmGetFileDatabase (environment); homeDB = XrmGetFileDatabase (environment);
XrmMergeDatabases (homeDB, &wxResourceDatabase); XrmMergeDatabases (homeDB, &wxResourceDatabase);

7
src/unix/utilsunx.cpp
View File

@@ -51,12 +51,17 @@
// many versions of Unices have this function, but it is not defined in system // many versions of Unices have this function, but it is not defined in system
// headers - please add your system here if it is the case for your OS. // headers - please add your system here if it is the case for your OS.
// SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this. // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
#if (defined(__SUN__) && !defined(__SunOs_5_6) && \ #if !defined(HAVE_USLEEP) && \
(defined(__SUN__) && !defined(__SunOs_5_6) && \
!defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
defined(__osf__) defined(__osf__)
extern "C" extern "C"
{ {
#ifdef __SUN__
int usleep(unsigned int usec);
#else // !Sun
void usleep(unsigned long usec); void usleep(unsigned long usec);
#endif // Sun/!Sun
}; };
#endif // Unices without usleep() #endif // Unices without usleep()