#include "wx/utils.h"
#include "wx/string.h"
#include "wx/list.h"
+#include "wx/log.h"
+#include "wx/gdicmn.h"
#include <ctype.h>
#include <string.h>
#include <unistd.h>
-#ifdef __SVR4__
-#include <sys/systeminfo.h>
-#endif
+//#ifdef __SVR4__
+//#include <sys/systeminfo.h>
+//#endif
#include "gdk/gdkx.h" // GDK_DISPLAY
#include "gdk/gdkprivate.h" // gdk_progclass
#include <X11/Xutil.h>
#include <X11/Xresource.h>
-#include "wx/log.h"
//-----------------------------------------------------------------------------
// constants
// Yuck this is really BOTH site and platform dependent
// so we should use some other strategy!
#ifdef __SUN__
- #define DEFAULT_XRESOURCE_DIR _T("/usr/openwin/lib/app-defaults")
+# define DEFAULT_XRESOURCE_DIR wxT("/usr/openwin/lib/app-defaults")
#else
- #define DEFAULT_XRESOURCE_DIR _T("/usr/lib/X11/app-defaults")
+# define DEFAULT_XRESOURCE_DIR wxT("/usr/lib/X11/app-defaults")
#endif
//-----------------------------------------------------------------------------
wxStrcpy(buf, name);
return buf; // Exists so ...
}
- if (*name == _T('/'))
+ if (*name == wxT('/'))
wxStrcpy(buf, name);
else
{
// Put in standard place for resource files if not absolute
wxStrcpy(buf, DEFAULT_XRESOURCE_DIR);
- wxStrcat(buf, _T("/"));
+ wxStrcat(buf, wxT("/"));
wxStrcat(buf, FileNameFromPath(name));
}
if (create)
if ((home = wxGetUserHome(wxString())) != NULL)
{
wxStrcpy(dest, home);
- if (dest[wxStrlen(dest) - 1] != _T('/')) wxStrcat(dest, _T("/"));
+ if (dest[wxStrlen(dest) - 1] != wxT('/')) wxStrcat(dest, wxT("/"));
if (filename == NULL)
{
- if ((filename = wxGetenv(_T("XENVIRONMENT"))) == NULL) filename = _T(".Xdefaults");
+ if ((filename = wxGetenv(wxT("XENVIRONMENT"))) == NULL) filename = wxT(".Xdefaults");
}
else
- if (*filename != _T('.')) wxStrcat(dest, _T("."));
+ if (*filename != wxT('.')) wxStrcat(dest, wxT("."));
wxStrcat(dest, filename);
}
else
{
- dest[0] = _T('\0');
+ dest[0] = wxT('\0');
}
}
return dest;
// Open XENVIRONMENT file, or if not defined, the .Xdefaults,
// and merge into existing database
- if ((environment = wxGetenv(_T("XENVIRONMENT"))) == NULL)
+ if ((environment = wxGetenv(wxT("XENVIRONMENT"))) == NULL)
{
- size_t len;
-#if wxUSE_UNICODE
- char hostbuf[1024];
-#endif
environment = GetIniFile(filename, (const wxChar *) NULL);
- len = wxStrlen(environment);
-#if !defined(SVR4) || defined(__sgi)
-#if wxUSE_UNICODE
- (void)gethostname(hostbuf, 1024 - len);
-#else
- (void)gethostname(environment + len, 1024 - len);
-#endif
-#else
-#if wxUSE_UNICODE
- (void)sysinfo(SI_HOSTNAME, hostbuf, 1024 - len);
-#else
- (void)sysinfo(SI_HOSTNAME, environment + len, 1024 - len);
-#endif
-#endif
-#if wxUSE_UNICODE
- wxStrcat(environment, wxConvCurrent->cMB2WX(hostbuf));
-#endif
+ size_t len = wxStrlen(environment);
+
+ wxChar hostbuf[1024];
+ (void)wxGetHostName(hostbuf, WXSIZEOF(hostbuf) - len);
+
+ wxStrcat(environment, hostbuf);
}
+
if ((homeDB = XrmGetFileDatabase(wxConvCurrent->cWX2MB(environment))))
XrmMergeDatabases(homeDB, &wxResourceDatabase);
}
void wxDeleteResources(const wxChar *file)
{
- wxLogTrace(wxTraceResAlloc, _T("Delete: Number = %d"), wxTheResourceCache->Number());
+ wxLogTrace(wxTraceResAlloc, wxT("Delete: Number = %d"), wxTheResourceCache->Number());
wxChar buffer[500];
(void)GetIniFile(buffer, file);
database = (XrmDatabase)node->Data();
else {
database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
- wxLogTrace(wxTraceResAlloc, _T("Write: Number = %d"), wxTheResourceCache->Number());
+ wxLogTrace(wxTraceResAlloc, wxT("Write: Number = %d"), wxTheResourceCache->Number());
wxTheResourceCache->Append(buffer, (wxObject *)database);
}
char resName[300];
- strcpy(resName, !section.IsNull() ? MBSTRINGCAST section.mb_str() : "wxWindows");
+ strcpy(resName, !section.IsNull() ? wxMBSTRINGCAST section.mb_str() : "wxWindows");
strcat(resName, ".");
strcat(resName, entry.mb_str());
XrmPutStringResource(&database, resName, value.mb_str());
else
{
database = XrmGetFileDatabase(wxConvCurrent->cWX2MB(buffer));
- wxLogTrace(wxTraceResAlloc, _T("Get: Number = %d"), wxTheResourceCache->Number());
+ wxLogTrace(wxTraceResAlloc, wxT("Get: Number = %d"), wxTheResourceCache->Number());
wxTheResourceCache->Append(buffer, (wxObject *)database);
}
} else