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

14
src/motif/utils.cpp
View File

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