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

many changes; major ones:

Browse Source 
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-04 20:15:38 +00:00
parent 9841339c74
commit e90c1d2a19
298 changed files with 5153 additions and 4672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/unix/dialup.cpp
View File

@@ -11,12 +11,12 @@
#include "wx/setup.h"
#if wxUSE_DIALUP_MANAGER
#ifdef __GNUG__
#pragma implementation "dialup.h"
#endif
#if wxUSE_DIALUP_MANAGER
#ifndef WX_PRECOMP
# include "wx/defs.h"
#endif // !PCH
@@ -72,7 +72,7 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
public:
wxDialUpManagerImpl();
~wxDialUpManagerImpl();
/** Could the dialup manager be initialized correctly? If this function
returns FALSE, no other functions will work neither, so it's a good idea
to call this function and check its result before calling any other
@@ -110,7 +110,7 @@ public:
}
/// returns TRUE if (async) dialing is in progress
inline virtual bool IsDialling() const
inline virtual bool IsDialing() const
{ return m_DialProcess != NULL; }
// cancel dialing the number initiated with Dial(async = TRUE)
@@ -180,7 +180,7 @@ private:
/// pid of dial process
int m_DialPId;
friend class wxDialProcess;
/// determine status
void CheckStatus(bool fromAsync = FALSE) const;
@@ -282,7 +282,7 @@ wxDialUpManagerImpl::HangUp(void)
{
if(m_IsOnline == 0)
return FALSE;
if(IsDialling())
if(IsDialing())
{
wxLogError(_("Already dialling ISP."));
return FALSE;
@@ -300,7 +300,7 @@ wxDialUpManagerImpl::HangUp(void)
bool
wxDialUpManagerImpl::CancelDialing()
{
if(! IsDialling())
if(! IsDialing())
return FALSE;
return kill(m_DialPId, SIGTERM) > 0;
}
@@ -397,13 +397,13 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
if(m_CanUseIfconfig != 0) // unknown or yes
{
wxASSERT(m_IfconfigPath.length());
wxString tmpfile = wxGetTempFileName("_wxdialuptest");
wxString cmd = "/bin/sh -c \'";
cmd << m_IfconfigPath << " >" << tmpfile << '\'';
/* I tried to add an option to wxExecute() to not close stdout,
so we could let ifconfig write directly to the tmpfile, but
this does not work. That should be faster, as it doesn<73>t call
this does not work. That should be faster, as it doesn<73>t call
the shell first. I have no idea why. :-( (KB) */
#if 0
// temporarily redirect stdout/stderr:
@@ -463,17 +463,17 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
// This can be used under Win 9x, too!
struct hostent *hp;
struct sockaddr_in serv_addr;
int sockfd;
int sockfd;
m_IsOnline = 0; // assume false
if((hp = gethostbyname(m_BeaconHost)) == NULL)
return; // no DNS no net
serv_addr.sin_family = hp->h_addrtype;
serv_addr.sin_family = hp->h_addrtype;
memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
serv_addr.sin_port = htons(m_BeaconPort);
if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
{
serv_addr.sin_port = htons(m_BeaconPort);
if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
{
// sys_error("cannot create socket for gw");
return;
}
@@ -484,9 +484,9 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
sizeof(serv_addr)) == -1)
return;
#endif
if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
{
{
//sys_error("cannot connect to server");
return;
}

30
src/unix/threadpsx.cpp
View File

@@ -109,7 +109,7 @@ wxMutex::wxMutex()
wxMutex::~wxMutex()
{
if (m_locked > 0)
wxLogDebug(_T("Freeing a locked mutex (%d locks)"), m_locked);
wxLogDebug(T("Freeing a locked mutex (%d locks)"), m_locked);
pthread_mutex_destroy( &(p_internal->p_mutex) );
delete p_internal;
@@ -120,7 +120,7 @@ wxMutexError wxMutex::Lock()
int err = pthread_mutex_lock( &(p_internal->p_mutex) );
if (err == EDEADLK)
{
wxLogDebug(_T("Locking this mutex would lead to deadlock!"));
wxLogDebug(T("Locking this mutex would lead to deadlock!"));
return wxMUTEX_DEAD_LOCK;
}
@@ -156,7 +156,7 @@ wxMutexError wxMutex::Unlock()
}
else
{
wxLogDebug(_T("Unlocking not locked mutex."));
wxLogDebug(T("Unlocking not locked mutex."));
return wxMUTEX_UNLOCKED;
}
@@ -320,7 +320,7 @@ void *wxThreadInternal::PthreadStart(void *ptr)
// terminate the thread
thread->Exit(status);
wxFAIL_MSG(_T("wxThread::Exit() can't return."));
wxFAIL_MSG(T("wxThread::Exit() can't return."));
return NULL;
}
@@ -389,7 +389,7 @@ wxThreadInternal::~wxThreadInternal()
wxThreadError wxThreadInternal::Run()
{
wxCHECK_MSG( GetState() == STATE_NEW, wxTHREAD_RUNNING,
_T("thread may only be started once after successful Create()") );
T("thread may only be started once after successful Create()") );
// the mutex was locked on Create(), so we will be able to lock it again
// only when the thread really starts executing and enters the wait -
@@ -408,7 +408,7 @@ wxThreadError wxThreadInternal::Run()
void wxThreadInternal::Wait()
{
wxCHECK_RET( WasCancelled(), _T("thread should have been cancelled first") );
wxCHECK_RET( WasCancelled(), T("thread should have been cancelled first") );
// if the thread we're waiting for is waiting for the GUI mutex, we will
// deadlock so make sure we release it temporarily
@@ -452,7 +452,7 @@ void wxThreadInternal::Pause()
// the state is set from the thread which pauses us first, this function
// is called later so the state should have been already set
wxCHECK_RET( m_state == STATE_PAUSED,
_T("thread must first be paused with wxThread::Pause().") );
T("thread must first be paused with wxThread::Pause().") );
// don't pause the thread which is being terminated - this would lead to
// deadlock if the thread is paused after Delete() had called Resume() but
@@ -467,7 +467,7 @@ void wxThreadInternal::Pause()
void wxThreadInternal::Resume()
{
wxCHECK_RET( m_state == STATE_PAUSED,
_T("can't resume thread which is not suspended.") );
T("can't resume thread which is not suspended.") );
// we will be able to lock this mutex only when Pause() starts waiting
wxMutexLocker lock(m_mutexSuspend);
@@ -578,7 +578,7 @@ void wxThread::SetPriority(unsigned int prio)
{
wxCHECK_RET( ((int)WXTHREAD_MIN_PRIORITY <= (int)prio) &&
((int)prio <= (int)WXTHREAD_MAX_PRIORITY),
_T("invalid thread priority") );
T("invalid thread priority") );
wxCriticalSectionLocker lock(m_critsect);
@@ -607,7 +607,7 @@ void wxThread::SetPriority(unsigned int prio)
case STATE_EXITED:
default:
wxFAIL_MSG(_T("impossible to set thread priority in this state"));
wxFAIL_MSG(T("impossible to set thread priority in this state"));
}
}
@@ -633,7 +633,7 @@ wxThreadError wxThread::Pause()
if ( p_internal->GetState() != STATE_RUNNING )
{
wxLogDebug(_T("Can't pause thread which is not running."));
wxLogDebug(T("Can't pause thread which is not running."));
return wxTHREAD_NOT_RUNNING;
}
@@ -657,7 +657,7 @@ wxThreadError wxThread::Resume()
}
else
{
wxLogDebug(_T("Attempt to resume a thread which is not paused."));
wxLogDebug(T("Attempt to resume a thread which is not paused."));
return wxTHREAD_MISC_ERROR;
}
@@ -769,7 +769,7 @@ wxThread::~wxThread()
m_critsect.Enter();
if (p_internal->GetState() != STATE_EXITED &&
p_internal->GetState() != STATE_NEW)
wxLogDebug(_T("The thread is being destroyed althought it is still running ! The application may crash."));
wxLogDebug(T("The thread is being destroyed althought it is still running ! The application may crash."));
m_critsect.Leave();
@@ -849,12 +849,12 @@ bool wxThreadModule::OnInit()
void wxThreadModule::OnExit()
{
wxASSERT_MSG( wxThread::IsMain(), _T("only main thread can be here") );
wxASSERT_MSG( wxThread::IsMain(), T("only main thread can be here") );
// terminate any threads left
size_t count = gs_allThreads.GetCount();
if ( count != 0u )
wxLogDebug(_T("Some threads were not terminated by the application."));
wxLogDebug(T("Some threads were not terminated by the application."));
for ( size_t n = 0u; n < count; n++ )
{

223
src/unix/utilsunx.cpp
View File

@@ -64,7 +64,7 @@
#ifdef __SUN__
int usleep(unsigned int usec);
#else // !Sun
#ifdef __EMX
#ifdef __EMX
/* I copied this from the XFree86 diffs. AV. */
#define INCL_DOSPROCESS
#include <os2.h>
@@ -72,9 +72,9 @@
{
DosSleep(delay ? (delay/1000l) : 1l);
}
#else
void usleep(unsigned long usec);
#endif
#else
void usleep(unsigned long usec);
#endif
#endif // Sun/EMX/Something else
};
#define HAVE_USLEEP 1
@@ -130,31 +130,31 @@ int wxKill(long pid, wxSignal sig)
long wxExecute( const wxString& command, bool sync, wxProcess *process )
{
wxCHECK_MSG( !command.IsEmpty(), 0, _T("can't exec empty command") );
wxCHECK_MSG( !command.IsEmpty(), 0, T("can't exec empty command") );
int argc = 0;
wxChar *argv[WXEXECUTE_NARGS];
wxString argument;
const wxChar *cptr = command.c_str();
wxChar quotechar = _T('\0'); // is arg quoted?
wxChar quotechar = T('\0'); // is arg quoted?
bool escaped = FALSE;
// split the command line in arguments
do
{
argument=_T("");
quotechar = _T('\0');
argument=T("");
quotechar = T('\0');
// eat leading whitespace:
while ( wxIsspace(*cptr) )
cptr++;
if ( *cptr == _T('\'') || *cptr == _T('"') )
if ( *cptr == T('\'') || *cptr == T('"') )
quotechar = *cptr++;
do
{
if ( *cptr == _T('\\') && ! escaped )
if ( *cptr == T('\\') && ! escaped )
{
escaped = TRUE;
cptr++;
@@ -167,11 +167,11 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
// have we reached the end of the argument?
if ( (*cptr == quotechar && ! escaped)
|| (quotechar == _T('\0') && wxIsspace(*cptr))
|| *cptr == _T('\0') )
|| (quotechar == T('\0') && wxIsspace(*cptr))
|| *cptr == T('\0') )
{
wxASSERT_MSG( argc < WXEXECUTE_NARGS,
_T("too many arguments in wxExecute") );
T("too many arguments in wxExecute") );
argv[argc] = new wxChar[argument.length() + 1];
wxStrcpy(argv[argc], argument.c_str());
@@ -202,7 +202,7 @@ bool wxShell(const wxString& command)
{
wxString cmd;
if ( !!command )
cmd.Printf(_T("xterm -e %s"), command.c_str());
cmd.Printf(T("xterm -e %s"), command.c_str());
else
cmd = command;
@@ -247,34 +247,43 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
long wxExecute( wxChar **argv, bool sync, wxProcess *process )
{
wxCHECK_MSG( *argv, 0, _T("can't exec empty command") );
wxCHECK_MSG( *argv, 0, T("can't exec empty command") );
int end_proc_detect[2];
#if wxUSE_UNICODE
int mb_argc = 0;
char *mb_argv[WXEXECUTE_NARGS];
while (argv[mb_argc]) {
wxWX2MBbuf mb_arg = wxConvCurrent->cWX2MB(argv[mb_argc]);
while (argv[mb_argc])
{
wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
mb_argv[mb_argc] = strdup(mb_arg);
mb_argc++;
}
mb_argv[mb_argc] = (char *) NULL;
#else
wxChar **mb_argv = argv;
#endif
// this macro will free memory we used above
#define ARGS_CLEANUP \
for ( mb_argc = 0; mb_argb[mb_argc]; mb_argc++ ) \
free(mb_argv[mb_argc])
#else // ANSI
// no need for cleanup
#define ARGS_CLEANUP
wxChar **mb_argv = argv;
#endif // Unicode/ANSI
#if wxUSE_GUI
// create pipes
int end_proc_detect[2];
if (pipe(end_proc_detect) == -1)
{
wxLogSysError( _("Pipe creation failed") );
#if wxUSE_UNICODE
mb_argc = 0;
while (mb_argv[mb_argc])
free(mb_argv[mb_argc++]);
#endif
ARGS_CLEANUP;
return 0;
}
#endif // wxUSE_GUI
// fork the process
#if HAVE_VFORK
@@ -285,17 +294,17 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
if (pid == -1)
{
wxLogSysError( _("Fork failed") );
#if wxUSE_UNICODE
mb_argc = 0;
while (mb_argv[mb_argc])
free(mb_argv[mb_argc++]);
#endif
ARGS_CLEANUP;
return 0;
}
else if (pid == 0)
{
#if wxUSE_GUI
// we're in child
close(end_proc_detect[0]); // close reading side
#endif // wxUSE_GUI
// These three lines close the open file descriptors to to avoid any
// input/output which might block the process or irritate the user. If
@@ -306,7 +315,12 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
// leave stderr opened, it won't do any hurm
for ( int fd = 0; fd < FD_SETSIZE; fd++ )
{
if ( fd != end_proc_detect[1] && fd != STDERR_FILENO )
#if wxUSE_GUI
if ( fd == end_proc_detect[1] )
continue;
#endif // wxUSE_GUI
if ( fd != STDERR_FILENO )
close(fd);
}
}
@@ -330,21 +344,18 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
}
else
{
#if wxUSE_GUI
// we're in parent
close(end_proc_detect[1]); // close writing side
wxEndProcessData *data = new wxEndProcessData;
data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
#if wxUSE_UNICODE
mb_argc = 0;
while (mb_argv[mb_argc])
free(mb_argv[mb_argc++]);
#endif
ARGS_CLEANUP;
if ( sync )
{
wxASSERT_MSG( !process, _T("wxProcess param ignored for sync exec") );
wxASSERT_MSG( !process, T("wxProcess param ignored for sync exec") );
data->process = NULL;
// sync execution: indicate it by negating the pid
@@ -370,7 +381,20 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
return pid;
}
#else // !wxUSE_GUI
wxASSERT_MSG( sync, T("async execution not supported yet") );
int exitcode = 0;
if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
{
wxLogSysError(_("Waiting for subprocess termination failed"));
}
return exitcode;
#endif // wxUSE_GUI
}
#undef ARGS_CLEANUP
}
// ----------------------------------------------------------------------------
@@ -381,14 +405,14 @@ const wxChar* wxGetHomeDir( wxString *home )
{
*home = wxGetUserHome( wxString() );
if ( home->IsEmpty() )
*home = _T("/");
*home = T("/");
return home->c_str();
}
#if wxUSE_UNICODE
const wxMB2WXbuf wxGetUserHome( const wxString &user )
#else // just for binary compatibility
#else // just for binary compatibility -- there is no 'const' here
char *wxGetUserHome( const wxString &user )
#endif
{
@@ -396,15 +420,15 @@ char *wxGetUserHome( const wxString &user )
if ( !user )
{
register wxChar *ptr;
wxChar *ptr;
if ((ptr = wxGetenv(_T("HOME"))) != NULL)
if ((ptr = wxGetenv(T("HOME"))) != NULL)
{
return ptr;
}
if ((ptr = wxGetenv(_T("USER"))) != NULL || (ptr = wxGetenv(_T("LOGNAME"))) != NULL)
if ((ptr = wxGetenv(T("USER"))) != NULL || (ptr = wxGetenv(T("LOGNAME"))) != NULL)
{
who = getpwnam(wxConvCurrent->cWX2MB(ptr));
who = getpwnam(wxConvertWX2MB(ptr));
}
// We now make sure the the user exists!
@@ -418,11 +442,7 @@ char *wxGetUserHome( const wxString &user )
who = getpwnam (user.mb_str());
}
#if wxUSE_UNICODE
return who ? wxConvCurrent->cMB2WX(who->pw_dir) : (wxMB2WXbuf)((wxChar*)NULL);
#else
return who ? who->pw_dir : ((char*)NULL);
#endif
return wxConvertMB2WX(who ? who->pw_dir : NULL);
}
// ----------------------------------------------------------------------------
@@ -434,9 +454,9 @@ char *wxGetUserHome( const wxString &user )
// private use only)
static bool wxGetHostNameInternal(wxChar *buf, int sz)
{
wxCHECK_MSG( buf, FALSE, _T("NULL pointer in wxGetHostNameInternal") );
wxCHECK_MSG( buf, FALSE, T("NULL pointer in wxGetHostNameInternal") );
*buf = _T('\0');
*buf = T('\0');
// we're using uname() which is POSIX instead of less standard sysinfo()
#if defined(HAVE_UNAME)
@@ -444,13 +464,13 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
bool ok = uname(&uts) != -1;
if ( ok )
{
wxStrncpy(buf, wxConvCurrent->cMB2WX(uts.nodename), sz - 1);
buf[sz] = _T('\0');
wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
buf[sz] = T('\0');
}
#elif defined(HAVE_GETHOSTNAME)
bool ok = gethostname(buf, sz) != -1;
#else // no uname, no gethostname
wxFAIL_MSG(_T("don't know host name for this machine"));
wxFAIL_MSG(T("don't know host name for this machine"));
bool ok = FALSE;
#endif // uname/gethostname
@@ -471,11 +491,11 @@ bool wxGetHostName(wxChar *buf, int sz)
{
// BSD systems return the FQDN, we only want the hostname, so extract
// it (we consider that dots are domain separators)
wxChar *dot = wxStrchr(buf, _T('.'));
wxChar *dot = wxStrchr(buf, T('.'));
if ( dot )
{
// nuke it
*dot = _T('\0');
*dot = T('\0');
}
}
@@ -488,9 +508,9 @@ bool wxGetFullHostName(wxChar *buf, int sz)
if ( ok )
{
if ( !wxStrchr(buf, _T('.')) )
if ( !wxStrchr(buf, T('.')) )
{
struct hostent *host = gethostbyname(wxConvCurrent->cWX2MB(buf));
struct hostent *host = gethostbyname(wxConvertWX2MB(buf));
if ( !host )
{
wxLogSysError(_("Cannot get the official hostname"));
@@ -500,7 +520,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
else
{
// the canonical name
wxStrncpy(buf, wxConvCurrent->cMB2WX(host->h_name), sz);
wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
}
}
//else: it's already a FQDN (BSD behaves this way)
@@ -513,10 +533,10 @@ bool wxGetUserId(wxChar *buf, int sz)
{
struct passwd *who;
*buf = _T('\0');
*buf = T('\0');
if ((who = getpwuid(getuid ())) != NULL)
{
wxStrncpy (buf, wxConvCurrent->cMB2WX(who->pw_name), sz - 1);
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
return TRUE;
}
@@ -528,18 +548,20 @@ bool wxGetUserName(wxChar *buf, int sz)
struct passwd *who;
char *comma;
*buf = _T('\0');
*buf = T('\0');
if ((who = getpwuid (getuid ())) != NULL) {
comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
wxStrncpy (buf, wxConvCurrent->cMB2WX(who->pw_gecos), sz - 1);
wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
return TRUE;
}
return FALSE;
}
#if wxUSE_GUI
// ----------------------------------------------------------------------------
// error and debug output routines (deprecated, use wxLog)
// ----------------------------------------------------------------------------
@@ -556,17 +578,17 @@ void wxDebugMsg( const char *format, ... )
void wxError( const wxString &msg, const wxString &title )
{
wxFprintf( stderr, _("Error ") );
if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, _T(".\n") );
if (!title.IsNull()) wxFprintf( stderr, T("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, T(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, T(".\n") );
}
void wxFatalError( const wxString &msg, const wxString &title )
{
wxFprintf( stderr, _("Error ") );
if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, _T(".\n") );
if (!title.IsNull()) wxFprintf( stderr, T("%s "), WXSTRINGCAST(title) );
if (!msg.IsNull()) wxFprintf( stderr, T(": %s"), WXSTRINGCAST(msg) );
wxFprintf( stderr, T(".\n") );
exit(3); // the same exit code as for abort()
}
@@ -591,7 +613,7 @@ void wxFatalError( const wxString &msg, const wxString &title )
static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
{
return gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) );
return gdk_font_load( wxConvertWX2MB(fontSpec) );
}
static inline void wxFreeFont(wxNativeFont font)
@@ -630,19 +652,19 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
wxString xfamily;
switch (family)
{
case wxDECORATIVE: xfamily = _T("lucida"); break;
case wxROMAN: xfamily = _T("times"); break;
case wxMODERN: xfamily = _T("courier"); break;
case wxSWISS: xfamily = _T("helvetica"); break;
case wxTELETYPE: xfamily = _T("lucidatypewriter"); break;
case wxSCRIPT: xfamily = _T("utopia"); break;
default: xfamily = _T("*");
case wxDECORATIVE: xfamily = T("lucida"); break;
case wxROMAN: xfamily = T("times"); break;
case wxMODERN: xfamily = T("courier"); break;
case wxSWISS: xfamily = T("helvetica"); break;
case wxTELETYPE: xfamily = T("lucidatypewriter"); break;
case wxSCRIPT: xfamily = T("utopia"); break;
default: xfamily = T("*");
}
wxString fontSpec;
if (!facename.IsEmpty())
{
fontSpec.Printf(_T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
fontSpec.Printf(T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
facename.c_str());
if ( wxTestFontSpec(fontSpec) )
@@ -655,19 +677,19 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
wxString xstyle;
switch (style)
{
case wxITALIC: xstyle = _T("i"); break;
case wxSLANT: xstyle = _T("o"); break;
case wxNORMAL: xstyle = _T("r"); break;
default: xstyle = _T("*"); break;
case wxITALIC: xstyle = T("i"); break;
case wxSLANT: xstyle = T("o"); break;
case wxNORMAL: xstyle = T("r"); break;
default: xstyle = T("*"); break;
}
wxString xweight;
switch (weight)
{
case wxBOLD: xweight = _T("bold"); break;
case wxBOLD: xweight = T("bold"); break;
case wxLIGHT:
case wxNORMAL: xweight = _T("medium"); break;
default: xweight = _T("*"); break;
case wxNORMAL: xweight = T("medium"); break;
default: xweight = T("*"); break;
}
wxString xregistry, xencoding;
@@ -696,23 +718,23 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
case wxFONTENCODING_ISO8859_15:
{
int cp = encoding - wxFONTENCODING_ISO8859_1 + 1;
xregistry = _T("iso8859");
xencoding.Printf(_T("%d"), cp);
xregistry = T("iso8859");
xencoding.Printf(T("%d"), cp);
}
break;
case wxFONTENCODING_KOI8:
xregistry = _T("koi8");
if ( wxTestFontSpec(_T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
xregistry = T("koi8");
if ( wxTestFontSpec(T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
{
xencoding = _T("1");
xencoding = T("1");
// test passed, no need to do it once more
test = FALSE;
}
else
{
xencoding = _T("*");
xencoding = T("*");
}
break;
@@ -721,12 +743,12 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
case wxFONTENCODING_CP1252:
{
int cp = encoding - wxFONTENCODING_CP1250 + 1250;
fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
fontSpec.Printf(T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
cp);
if ( wxTestFontSpec(fontSpec) )
{
xregistry = _T("microsoft");
xencoding.Printf(_T("cp%d"), cp);
xregistry = T("microsoft");
xencoding.Printf(T("cp%d"), cp);
// test passed, no need to do it once more
test = FALSE;
@@ -734,8 +756,8 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
else
{
// fall back to LatinX
xregistry = _T("iso8859");
xencoding.Printf(_T("%d"), cp - 1249);
xregistry = T("iso8859");
xencoding.Printf(T("%d"), cp - 1249);
}
}
break;
@@ -744,23 +766,23 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
default:
test = FALSE;
xregistry =
xencoding = _T("*");
xencoding = T("*");
}
if ( test )
{
fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
fontSpec.Printf(T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
xregistry.c_str(), xencoding.c_str());
if ( !wxTestFontSpec(fontSpec) )
{
// this encoding isn't available - what to do?
xregistry =
xencoding = _T("*");
xencoding = T("*");
}
}
// construct the X font spec from our data
fontSpec.Printf(_T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
fontSpec.Printf(T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
pointSize, xregistry.c_str(), xencoding.c_str());
@@ -818,3 +840,4 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
return font;
}
#endif // wxUSE_GUI