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

Take best fitting type for available memory measurement.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-27 18:47:26 +00:00
parent 49a1436640
commit 9d8aca4832
8 changed files with 554 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/function.tex
View File

@@ -1244,7 +1244,7 @@ current computer and/or user characteristics.
\membersection{::wxGetFreeMemory}\label{wxgetfreememory}
\func{long}{wxGetFreeMemory}{\void}
\func{wxMemorySize}{wxGetFreeMemory}{\void}
Returns the amount of free memory in bytes under environments which
support it, and -1 if not supported. Currently, it is supported only

14
include/wx/utils.h
View File

@@ -61,6 +61,18 @@ class WXDLLIMPEXP_CORE wxPoint;
#define wxMax(a,b) (((a) > (b)) ? (a) : (b))
#define wxMin(a,b) (((a) < (b)) ? (a) : (b))
// wxGetFreeMemory can return huge amount of memory on 64-bit platforms
// define wxMemorySize according to the type which best fits your platform
#if wxUSE_LONGLONG && defined(__WIN64__)
// 64 bit Windowses have sizeof(long) only 32 bit long
// we need to use wxLongLong to express memory sizes
#define wxMemorySize wxLongLong
#else
// 64 bit UNIX has sizeof(long) = 64
// assume 32 bit platforms cannnot return more than 32bits of
#define wxMemorySize long
#endif
// ----------------------------------------------------------------------------
// String functions (deprecated, use wxString)
// ----------------------------------------------------------------------------
@@ -283,7 +295,7 @@ wxDEPRECATED( WXDLLIMPEXP_BASE void wxUsleep(unsigned long milliseconds) );
WXDLLIMPEXP_BASE unsigned long wxGetProcessId();
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
WXDLLIMPEXP_BASE long wxGetFreeMemory();
WXDLLIMPEXP_BASE wxMemorySize wxGetFreeMemory();
// should wxApp::OnFatalException() be called?
WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);

96
src/mac/carbon/utils.cpp
View File

@@ -21,9 +21,9 @@
#if wxUSE_GUI
#include "wx/mac/uma.h"
#include "wx/font.h"
#include "wx/font.h"
#else
#include "wx/intl.h"
#include "wx/intl.h"
#endif
#include <ctype.h>
@@ -260,7 +260,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
else
buf[0] = 0 ;
return TRUE;
return true;
}
// Get user ID e.g. jacs
@@ -298,7 +298,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
else
buf[0] = 0 ;
return TRUE;
return true;
}
int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
@@ -313,7 +313,7 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
return false ;
}
// set the env var name to the given value, return TRUE on success
// set the env var name to the given value, return true on success
WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
{
// TODO : under classic there is no environement support, under X yes
@@ -326,34 +326,34 @@ WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
bool wxShell(const wxString& command)
{
// TODO
return FALSE;
return false;
}
// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
return FALSE;
return false;
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
return FreeMem() ;
return (wxMemorySize)FreeMem() ;
}
#ifndef __DARWIN__
void wxMicroSleep(unsigned long microseconds)
{
AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
MPDelayUntil( & wakeup);
AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
MPDelayUntil( & wakeup);
}
void wxMilliSleep(unsigned long milliseconds)
{
AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
MPDelayUntil( & wakeup);
AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
MPDelayUntil( & wakeup);
}
void wxSleep(int nSecs)
@@ -406,7 +406,7 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{
// TODO
return FALSE;
return false;
}
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
@@ -436,7 +436,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
{
// TODO
return FALSE;
return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
@@ -447,9 +447,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
{
*value = (float)strtod(s, NULL);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
@@ -460,9 +460,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
{
*value = strtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
@@ -473,9 +473,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
{
*value = (int)strtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
#endif // wxUSE_RESOURCES
@@ -507,7 +507,7 @@ void wxEndBusyCursor()
}
}
// TRUE if we're between the above two calls
// true if we're between the above two calls
bool wxIsBusy()
{
return (gs_wxBusyCursorCount > 0);
@@ -539,7 +539,7 @@ wxString wxMacFindFolder( short vol,
bool wxCheckForInterrupt(wxWindow *wnd)
{
// TODO
return FALSE;
return false;
}
void wxGetMousePosition( int* x, int* y )
@@ -552,10 +552,10 @@ void wxGetMousePosition( int* x, int* y )
*y = pt.v ;
};
// Return TRUE if we have a colour display
// Return true if we have a colour display
bool wxColourDisplay()
{
return TRUE;
return true;
}
// Returns depth of screen
@@ -644,7 +644,7 @@ wxChar *wxGetUserHome (const wxString& user)
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{
if ( path.empty() )
return FALSE;
return false;
wxString p = path ;
if (p[0u] == ':' ) {
@@ -893,25 +893,25 @@ void wxMacControl::VisibilityChanged(bool shown)
void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
{
m_font = font ;
ControlFontStyleRec fontStyle;
if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
{
switch( font.MacGetThemeFontID() )
{
case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
case 109 /*mini font */ : fontStyle.font = -5 ; break ;
case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
default : fontStyle.font = kControlFontBigSystemFont ; break ;
}
fontStyle.flags = kControlUseFontMask ;
}
else
{
fontStyle.font = font.MacGetFontNum() ;
fontStyle.style = font.MacGetFontStyle() ;
fontStyle.size = font.MacGetFontSize() ;
fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
ControlFontStyleRec fontStyle;
if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
{
switch( font.MacGetThemeFontID() )
{
case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
case 109 /*mini font */ : fontStyle.font = -5 ; break ;
case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
default : fontStyle.font = kControlFontBigSystemFont ; break ;
}
fontStyle.flags = kControlUseFontMask ;
}
else
{
fontStyle.font = font.MacGetFontNum() ;
fontStyle.style = font.MacGetFontStyle() ;
fontStyle.size = font.MacGetFontSize() ;
fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
fontStyle.just = teJustLeft ;
fontStyle.flags |= kControlUseJustMask ;
@@ -930,7 +930,7 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
fontStyle.flags |= kControlUseForeColorMask ;
}
::SetControlFontStyle( m_controlRef , &fontStyle );
::SetControlFontStyle( m_controlRef , &fontStyle );
}
void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
@@ -1045,8 +1045,8 @@ void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to
void wxMacControl::SetRect( Rect *r )
{
#if TARGET_API_MAC_OSX
//A HIRect is actually a CGRect on OSX - which consists of two structures -
//CGPoint and CGSize, which have two floats each
//A HIRect is actually a CGRect on OSX - which consists of two structures -
//CGPoint and CGSize, which have two floats each
HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ;
HIViewSetFrame ( m_controlRef , &hir ) ;
#else

594
src/mac/classic/utils.cpp
View File

@@ -21,9 +21,9 @@
#if wxUSE_GUI
#include "wx/mac/uma.h"
#include "wx/font.h"
#include "wx/font.h"
#else
#include "wx/intl.h"
#include "wx/intl.h"
#endif
#include <ctype.h>
@@ -114,7 +114,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
else
buf[0] = 0 ;
return TRUE;
return true;
}
// Get user ID e.g. jacs
@@ -152,7 +152,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
else
buf[0] = 0 ;
return TRUE;
return true;
}
int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
@@ -167,7 +167,7 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
return false ;
}
// set the env var name to the given value, return TRUE on success
// set the env var name to the given value, return true on success
WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
{
// TODO : under classic there is no environement support, under X yes
@@ -180,20 +180,20 @@ WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
bool wxShell(const wxString& command)
{
// TODO
return FALSE;
return false;
}
// Shutdown or reboot the PC
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
return FALSE;
return false;
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
return FreeMem() ;
return (wxMemorySize)FreeMem() ;
}
void wxUsleep(unsigned long milliseconds)
@@ -253,7 +253,7 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{
// TODO
return FALSE;
return false;
}
bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
@@ -283,7 +283,7 @@ bool wxWriteResource(const wxString& section, const wxString& entry, int value,
bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
{
// TODO
return FALSE;
return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
@@ -294,9 +294,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
{
*value = (float)strtod(s, NULL);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
@@ -307,9 +307,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
{
*value = strtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
@@ -320,9 +320,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
{
*value = (int)strtol(s, NULL, 10);
delete[] s;
return TRUE;
return true;
}
else return FALSE;
else return false;
}
#endif // wxUSE_RESOURCES
@@ -354,7 +354,7 @@ void wxEndBusyCursor()
}
}
// TRUE if we're between the above two calls
// true if we're between the above two calls
bool wxIsBusy()
{
return (gs_wxBusyCursorCount > 0);
@@ -392,7 +392,7 @@ wxString wxMacFindFolder( short vol,
bool wxCheckForInterrupt(wxWindow *wnd)
{
// TODO
return FALSE;
return false;
}
void wxGetMousePosition( int* x, int* y )
@@ -405,10 +405,10 @@ void wxGetMousePosition( int* x, int* y )
*y = pt.v ;
};
// Return TRUE if we have a colour display
// Return true if we have a colour display
bool wxColourDisplay()
{
return TRUE;
return true;
}
// Returns depth of screen
@@ -524,7 +524,7 @@ wxChar *wxGetUserHome (const wxString& user)
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{
if ( path.empty() )
return FALSE;
return false;
wxString p = path ;
if (p[0u] == ':' ) {
@@ -579,146 +579,146 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from )
wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
{
TextEncodingBase enc = 0 ;
if ( encoding == wxFONTENCODING_DEFAULT )
{
TextEncodingBase enc = 0 ;
if ( encoding == wxFONTENCODING_DEFAULT )
{
#if wxUSE_GUI
encoding = wxFont::GetDefaultEncoding() ;
encoding = wxFont::GetDefaultEncoding() ;
#else
encoding = wxLocale::GetSystemEncoding() ;
encoding = wxLocale::GetSystemEncoding() ;
#endif
}
}
switch( encoding)
{
case wxFONTENCODING_ISO8859_1 :
enc = kTextEncodingISOLatin1 ;
break ;
case wxFONTENCODING_ISO8859_2 :
enc = kTextEncodingISOLatin2;
break ;
case wxFONTENCODING_ISO8859_3 :
enc = kTextEncodingISOLatin3 ;
break ;
case wxFONTENCODING_ISO8859_4 :
enc = kTextEncodingISOLatin4;
break ;
case wxFONTENCODING_ISO8859_5 :
enc = kTextEncodingISOLatinCyrillic;
break ;
case wxFONTENCODING_ISO8859_6 :
enc = kTextEncodingISOLatinArabic;
break ;
case wxFONTENCODING_ISO8859_7 :
enc = kTextEncodingISOLatinGreek;
break ;
case wxFONTENCODING_ISO8859_8 :
enc = kTextEncodingISOLatinHebrew;
break ;
case wxFONTENCODING_ISO8859_9 :
enc = kTextEncodingISOLatin5;
break ;
case wxFONTENCODING_ISO8859_10 :
enc = kTextEncodingISOLatin6;
break ;
case wxFONTENCODING_ISO8859_13 :
enc = kTextEncodingISOLatin7;
break ;
case wxFONTENCODING_ISO8859_14 :
enc = kTextEncodingISOLatin8;
break ;
case wxFONTENCODING_ISO8859_15 :
enc = kTextEncodingISOLatin9;
break ;
switch( encoding)
{
case wxFONTENCODING_ISO8859_1 :
enc = kTextEncodingISOLatin1 ;
break ;
case wxFONTENCODING_ISO8859_2 :
enc = kTextEncodingISOLatin2;
break ;
case wxFONTENCODING_ISO8859_3 :
enc = kTextEncodingISOLatin3 ;
break ;
case wxFONTENCODING_ISO8859_4 :
enc = kTextEncodingISOLatin4;
break ;
case wxFONTENCODING_ISO8859_5 :
enc = kTextEncodingISOLatinCyrillic;
break ;
case wxFONTENCODING_ISO8859_6 :
enc = kTextEncodingISOLatinArabic;
break ;
case wxFONTENCODING_ISO8859_7 :
enc = kTextEncodingISOLatinGreek;
break ;
case wxFONTENCODING_ISO8859_8 :
enc = kTextEncodingISOLatinHebrew;
break ;
case wxFONTENCODING_ISO8859_9 :
enc = kTextEncodingISOLatin5;
break ;
case wxFONTENCODING_ISO8859_10 :
enc = kTextEncodingISOLatin6;
break ;
case wxFONTENCODING_ISO8859_13 :
enc = kTextEncodingISOLatin7;
break ;
case wxFONTENCODING_ISO8859_14 :
enc = kTextEncodingISOLatin8;
break ;
case wxFONTENCODING_ISO8859_15 :
enc = kTextEncodingISOLatin9;
break ;
case wxFONTENCODING_KOI8 :
enc = kTextEncodingKOI8_R;
break ;
case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
enc = kTextEncodingDOSRussian;
break ;
case wxFONTENCODING_KOI8 :
enc = kTextEncodingKOI8_R;
break ;
case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
enc = kTextEncodingDOSRussian;
break ;
/*
case wxFONTENCODING_BULGARIAN :
enc = ;
break ;
case wxFONTENCODING_BULGARIAN :
enc = ;
break ;
*/
case wxFONTENCODING_CP437 :
enc =kTextEncodingDOSLatinUS ;
break ;
case wxFONTENCODING_CP850 :
enc = kTextEncodingDOSLatin1;
break ;
case wxFONTENCODING_CP852 :
enc = kTextEncodingDOSLatin2;
break ;
case wxFONTENCODING_CP855 :
enc = kTextEncodingDOSCyrillic;
break ;
case wxFONTENCODING_CP866 :
enc =kTextEncodingDOSRussian ;
break ;
case wxFONTENCODING_CP874 :
enc = kTextEncodingDOSThai;
break ;
case wxFONTENCODING_CP932 :
enc = kTextEncodingDOSJapanese;
break ;
case wxFONTENCODING_CP936 :
enc =kTextEncodingDOSChineseSimplif ;
break ;
case wxFONTENCODING_CP949 :
enc = kTextEncodingDOSKorean;
break ;
case wxFONTENCODING_CP950 :
enc = kTextEncodingDOSChineseTrad;
break ;
case wxFONTENCODING_CP437 :
enc =kTextEncodingDOSLatinUS ;
break ;
case wxFONTENCODING_CP850 :
enc = kTextEncodingDOSLatin1;
break ;
case wxFONTENCODING_CP852 :
enc = kTextEncodingDOSLatin2;
break ;
case wxFONTENCODING_CP855 :
enc = kTextEncodingDOSCyrillic;
break ;
case wxFONTENCODING_CP866 :
enc =kTextEncodingDOSRussian ;
break ;
case wxFONTENCODING_CP874 :
enc = kTextEncodingDOSThai;
break ;
case wxFONTENCODING_CP932 :
enc = kTextEncodingDOSJapanese;
break ;
case wxFONTENCODING_CP936 :
enc =kTextEncodingDOSChineseSimplif ;
break ;
case wxFONTENCODING_CP949 :
enc = kTextEncodingDOSKorean;
break ;
case wxFONTENCODING_CP950 :
enc = kTextEncodingDOSChineseTrad;
break ;
case wxFONTENCODING_CP1250 :
enc = kTextEncodingWindowsLatin2;
break ;
case wxFONTENCODING_CP1251 :
enc =kTextEncodingWindowsCyrillic ;
break ;
case wxFONTENCODING_CP1252 :
enc =kTextEncodingWindowsLatin1 ;
break ;
case wxFONTENCODING_CP1253 :
enc = kTextEncodingWindowsGreek;
break ;
case wxFONTENCODING_CP1254 :
enc = kTextEncodingWindowsLatin5;
break ;
case wxFONTENCODING_CP1255 :
enc =kTextEncodingWindowsHebrew ;
break ;
case wxFONTENCODING_CP1256 :
enc =kTextEncodingWindowsArabic ;
break ;
case wxFONTENCODING_CP1257 :
enc = kTextEncodingWindowsBalticRim;
break ;
case wxFONTENCODING_CP1250 :
enc = kTextEncodingWindowsLatin2;
break ;
case wxFONTENCODING_CP1251 :
enc =kTextEncodingWindowsCyrillic ;
break ;
case wxFONTENCODING_CP1252 :
enc =kTextEncodingWindowsLatin1 ;
break ;
case wxFONTENCODING_CP1253 :
enc = kTextEncodingWindowsGreek;
break ;
case wxFONTENCODING_CP1254 :
enc = kTextEncodingWindowsLatin5;
break ;
case wxFONTENCODING_CP1255 :
enc =kTextEncodingWindowsHebrew ;
break ;
case wxFONTENCODING_CP1256 :
enc =kTextEncodingWindowsArabic ;
break ;
case wxFONTENCODING_CP1257 :
enc = kTextEncodingWindowsBalticRim;
break ;
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
break ;
case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
break ;
case wxFONTENCODING_EUC_JP :
enc = kTextEncodingEUC_JP;
break ;
case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
break ;
case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
break ;
case wxFONTENCODING_EUC_JP :
enc = kTextEncodingEUC_JP;
break ;
case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_MACROMAN :
enc = kTextEncodingMacRoman ;
@@ -840,144 +840,144 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
case wxFONTENCODING_MACKEYBOARD :
enc = kTextEncodingMacKeyboardGlyphs ;
break ;
default :
// to make gcc happy
break ;
} ;
return enc ;
default :
// to make gcc happy
break ;
} ;
return enc ;
}
wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
{
wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
switch( encoding)
{
case kTextEncodingISOLatin1 :
enc = wxFONTENCODING_ISO8859_1 ;
break ;
case kTextEncodingISOLatin2 :
enc = wxFONTENCODING_ISO8859_2;
break ;
case kTextEncodingISOLatin3 :
enc = wxFONTENCODING_ISO8859_3 ;
break ;
case kTextEncodingISOLatin4 :
enc = wxFONTENCODING_ISO8859_4;
break ;
case kTextEncodingISOLatinCyrillic :
enc = wxFONTENCODING_ISO8859_5;
break ;
case kTextEncodingISOLatinArabic :
enc = wxFONTENCODING_ISO8859_6;
break ;
case kTextEncodingISOLatinGreek :
enc = wxFONTENCODING_ISO8859_7;
break ;
case kTextEncodingISOLatinHebrew :
enc = wxFONTENCODING_ISO8859_8;
break ;
case kTextEncodingISOLatin5 :
enc = wxFONTENCODING_ISO8859_9;
break ;
case kTextEncodingISOLatin6 :
enc = wxFONTENCODING_ISO8859_10;
break ;
case kTextEncodingISOLatin7 :
enc = wxFONTENCODING_ISO8859_13;
break ;
case kTextEncodingISOLatin8 :
enc = wxFONTENCODING_ISO8859_14;
break ;
case kTextEncodingISOLatin9 :
enc =wxFONTENCODING_ISO8859_15 ;
break ;
switch( encoding)
{
case kTextEncodingISOLatin1 :
enc = wxFONTENCODING_ISO8859_1 ;
break ;
case kTextEncodingISOLatin2 :
enc = wxFONTENCODING_ISO8859_2;
break ;
case kTextEncodingISOLatin3 :
enc = wxFONTENCODING_ISO8859_3 ;
break ;
case kTextEncodingISOLatin4 :
enc = wxFONTENCODING_ISO8859_4;
break ;
case kTextEncodingISOLatinCyrillic :
enc = wxFONTENCODING_ISO8859_5;
break ;
case kTextEncodingISOLatinArabic :
enc = wxFONTENCODING_ISO8859_6;
break ;
case kTextEncodingISOLatinGreek :
enc = wxFONTENCODING_ISO8859_7;
break ;
case kTextEncodingISOLatinHebrew :
enc = wxFONTENCODING_ISO8859_8;
break ;
case kTextEncodingISOLatin5 :
enc = wxFONTENCODING_ISO8859_9;
break ;
case kTextEncodingISOLatin6 :
enc = wxFONTENCODING_ISO8859_10;
break ;
case kTextEncodingISOLatin7 :
enc = wxFONTENCODING_ISO8859_13;
break ;
case kTextEncodingISOLatin8 :
enc = wxFONTENCODING_ISO8859_14;
break ;
case kTextEncodingISOLatin9 :
enc =wxFONTENCODING_ISO8859_15 ;
break ;
case kTextEncodingKOI8_R :
enc = wxFONTENCODING_KOI8;
break ;
case kTextEncodingKOI8_R :
enc = wxFONTENCODING_KOI8;
break ;
/*
case :
enc = wxFONTENCODING_BULGARIAN;
break ;
case :
enc = wxFONTENCODING_BULGARIAN;
break ;
*/
case kTextEncodingDOSLatinUS :
enc = wxFONTENCODING_CP437;
break ;
case kTextEncodingDOSLatin1 :
enc = wxFONTENCODING_CP850;
break ;
case kTextEncodingDOSLatin2 :
enc =wxFONTENCODING_CP852 ;
break ;
case kTextEncodingDOSCyrillic :
enc = wxFONTENCODING_CP855;
break ;
case kTextEncodingDOSRussian :
enc = wxFONTENCODING_CP866;
break ;
case kTextEncodingDOSThai :
enc =wxFONTENCODING_CP874 ;
break ;
case kTextEncodingDOSJapanese :
enc = wxFONTENCODING_CP932;
break ;
case kTextEncodingDOSChineseSimplif :
enc = wxFONTENCODING_CP936;
break ;
case kTextEncodingDOSKorean :
enc = wxFONTENCODING_CP949;
break ;
case kTextEncodingDOSChineseTrad :
enc = wxFONTENCODING_CP950;
break ;
case kTextEncodingDOSLatinUS :
enc = wxFONTENCODING_CP437;
break ;
case kTextEncodingDOSLatin1 :
enc = wxFONTENCODING_CP850;
break ;
case kTextEncodingDOSLatin2 :
enc =wxFONTENCODING_CP852 ;
break ;
case kTextEncodingDOSCyrillic :
enc = wxFONTENCODING_CP855;
break ;
case kTextEncodingDOSRussian :
enc = wxFONTENCODING_CP866;
break ;
case kTextEncodingDOSThai :
enc =wxFONTENCODING_CP874 ;
break ;
case kTextEncodingDOSJapanese :
enc = wxFONTENCODING_CP932;
break ;
case kTextEncodingDOSChineseSimplif :
enc = wxFONTENCODING_CP936;
break ;
case kTextEncodingDOSKorean :
enc = wxFONTENCODING_CP949;
break ;
case kTextEncodingDOSChineseTrad :
enc = wxFONTENCODING_CP950;
break ;
case kTextEncodingWindowsLatin2 :
enc = wxFONTENCODING_CP1250;
break ;
case kTextEncodingWindowsCyrillic :
enc = wxFONTENCODING_CP1251;
break ;
case kTextEncodingWindowsLatin1 :
enc = wxFONTENCODING_CP1252;
break ;
case kTextEncodingWindowsGreek :
enc = wxFONTENCODING_CP1253;
break ;
case kTextEncodingWindowsLatin5 :
enc = wxFONTENCODING_CP1254;
break ;
case kTextEncodingWindowsHebrew :
enc = wxFONTENCODING_CP1255;
break ;
case kTextEncodingWindowsArabic :
enc = wxFONTENCODING_CP1256;
break ;
case kTextEncodingWindowsBalticRim :
enc =wxFONTENCODING_CP1257 ;
break ;
case kTextEncodingEUC_JP :
enc = wxFONTENCODING_EUC_JP;
break ;
/*
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
break ;
case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
break ;
case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case kTextEncodingWindowsLatin2 :
enc = wxFONTENCODING_CP1250;
break ;
case kTextEncodingWindowsCyrillic :
enc = wxFONTENCODING_CP1251;
break ;
case kTextEncodingWindowsLatin1 :
enc = wxFONTENCODING_CP1252;
break ;
case kTextEncodingWindowsGreek :
enc = wxFONTENCODING_CP1253;
break ;
case kTextEncodingWindowsLatin5 :
enc = wxFONTENCODING_CP1254;
break ;
case kTextEncodingWindowsHebrew :
enc = wxFONTENCODING_CP1255;
break ;
case kTextEncodingWindowsArabic :
enc = wxFONTENCODING_CP1256;
break ;
case kTextEncodingWindowsBalticRim :
enc =wxFONTENCODING_CP1257 ;
break ;
case kTextEncodingEUC_JP :
enc = wxFONTENCODING_EUC_JP;
break ;
/*
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
break ;
case wxFONTENCODING_UTF8 :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
break ;
case wxFONTENCODING_UTF16BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF16LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
break ;
case wxFONTENCODING_UTF32BE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
case wxFONTENCODING_UTF32LE :
enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
break ;
*/
case kTextEncodingMacRoman :
enc = wxFONTENCODING_MACROMAN ;
@@ -1099,8 +1099,8 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
case kTextEncodingMacKeyboardGlyphs :
enc = wxFONTENCODING_MACKEYBOARD ;
break ;
} ;
return enc ;
} ;
return enc ;
}
#endif // wxUSE_BASE
@@ -1117,16 +1117,16 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
// converts this string into a carbon foundation string with optional pc 2 mac encoding
void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
{
Release() ;
Release() ;
wxString str = st ;
wxString str = st ;
wxMacConvertNewlines13To10( &str ) ;
#if wxUSE_UNICODE
#if SIZEOF_WCHAR_T == 2
m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
(UniChar*)str.wc_str() , str.Len() );
m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
(UniChar*)str.wc_str() , str.Len() );
#else
wxMBConvUTF16BE converter ;
wxMBConvUTF16BE converter ;
size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
UniChar *unibuf = new UniChar[ unicharlen / sizeof(UniChar) + 1 ] ;
converter.WC2MB( (char*)unibuf , str.wc_str() , unicharlen ) ;
@@ -1156,8 +1156,8 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
UniChar* unibuf = new UniChar[ cflen + 1 ] ;
CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) unibuf ) ;
unibuf[cflen] = 0 ;
wxMBConvUTF16BE converter ;
noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;
wxMBConvUTF16BE converter ;
noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;
buf = new wxChar[ noChars + 1 ] ;
converter.MB2WC( buf , (const char*)unibuf , noChars ) ;
delete[] unibuf ;
@@ -1183,7 +1183,7 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
void wxMacConvertNewlines13To10( char * data )
{
char * buf = data ;
char * buf = data ;
while( (buf=strchr(buf,0x0d)) != NULL )
{
*buf = 0x0a ;
@@ -1193,7 +1193,7 @@ void wxMacConvertNewlines13To10( char * data )
void wxMacConvertNewlines10To13( char * data )
{
char * buf = data ;
char * buf = data ;
while( (buf=strchr(buf,0x0a)) != NULL )
{
*buf = 0x0d ;
@@ -1212,7 +1212,7 @@ void wxMacConvertNewlines13To10( wxString * data )
wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines13To10( buf ) ;
wxMacConvertNewlines13To10( buf ) ;
}
void wxMacConvertNewlines10To13( wxString * data )
@@ -1225,14 +1225,14 @@ void wxMacConvertNewlines10To13( wxString * data )
wxString temp(*data) ;
wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines10To13( buf ) ;
wxMacConvertNewlines10To13( buf ) ;
}
#if wxUSE_UNICODE
void wxMacConvertNewlines13To10( wxChar * data )
{
wxChar * buf = data ;
wxChar * buf = data ;
while( (buf=wxStrchr(buf,0x0d)) != NULL )
{
*buf = 0x0a ;
@@ -1242,7 +1242,7 @@ void wxMacConvertNewlines13To10( wxChar * data )
void wxMacConvertNewlines10To13( wxChar * data )
{
wxChar * buf = data ;
wxChar * buf = data ;
while( (buf=wxStrchr(buf,0x0a)) != NULL )
{
*buf = 0x0d ;

13
src/msw/utils.cpp
View File

@@ -1010,15 +1010,20 @@ bool wxShutdown(wxShutdownFlags wFlags)
// ----------------------------------------------------------------------------
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
#if defined(__WIN32__) && !defined(__BORLANDC__)
#if defined(__WIN64__)
MEMORYSTATUSEX memStatex;
statex.dwLength = sizeof (statex);
GlobalMemoryStatusEx (&statex);
return (wxMemorySize)memStatus.ullAvailPhys;
#elif defined(__WIN32__) && !defined(__BORLANDC__)
MEMORYSTATUS memStatus;
memStatus.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&memStatus);
return memStatus.dwAvailPhys;
return (wxMemorySize)memStatus.dwAvailPhys;
#else
return (long)GetFreeSpace(0);
return (wxMemorySize)GetFreeSpace(0);
#endif
}

28
src/os2/utils.cpp
View File

@@ -95,7 +95,7 @@ bool wxGetHostName(
wxStrncpy(zBuf, zSysname, nMaxSize - 1);
zBuf[nMaxSize] = _T('\0');
#endif
return *zBuf ? TRUE : FALSE;
return *zBuf ? true : false;
}
// Get user ID e.g. jacs
@@ -108,9 +108,9 @@ bool wxGetUserId(
long lrc;
// UPM procs return 0 on success
lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
if (lrc == 0) return TRUE;
if (lrc == 0) return true;
#endif
return FALSE;
return false;
}
bool wxGetUserName(
@@ -125,7 +125,7 @@ bool wxGetUserName(
#else
wxStrncpy(zBuf, _T("Unknown User"), nMaxSize);
#endif
return TRUE;
return true;
}
int wxKill(
@@ -201,11 +201,11 @@ bool wxShell(
bool wxShutdown(wxShutdownFlags wFlags)
{
// TODO
return FALSE;
return false;
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
void* pMemptr = NULL;
ULONG lSize;
@@ -215,8 +215,8 @@ long wxGetFreeMemory()
lMemFlags = PAG_FREE;
rc = ::DosQueryMem(pMemptr, &lSize, &lMemFlags);
if (rc != 0)
return -1L;
return (long)lSize;
lSize = -1L;
return (wxMemorySize)lSize;
}
// ----------------------------------------------------------------------------
@@ -228,14 +228,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
// wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var);
if ( !p )
return FALSE;
return false;
if ( value )
{
*value = p;
}
return TRUE;
return true;
}
bool wxSetEnv(const wxString& variable, const wxChar *value)
@@ -257,7 +257,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
return putenv(buf) == 0;
#else // no way to set an env var
return FALSE;
return false;
#endif
}
@@ -361,9 +361,9 @@ void wxAppTraits::TerminateGui(unsigned long ulHab)
wxToolkitInfo & wxConsoleAppTraits::GetToolkitInfo()
{
static wxToolkitInfo vInfo;
ULONG ulSysInfo[QSV_MAX] = {0};
APIRET ulrc;
static wxToolkitInfo vInfo;
ULONG ulSysInfo[QSV_MAX] = {0};
APIRET ulrc;
vInfo.name = _T("wxBase");
ulrc = ::DosQuerySysInfo( 1L

4
src/palmos/utils.cpp
View File

@@ -156,7 +156,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
// ----------------------------------------------------------------------------
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
uint32_t freeTotal = 0;
uint32_t freeHeap;
@@ -171,7 +171,7 @@ long wxGetFreeMemory()
freeTotal+=freeHeap;
}
return freeTotal;
return (wxMemorySize)freeTotal;
}
unsigned long wxGetProcessId()

52
src/unix/utilsunx.cpp
View File

@@ -259,7 +259,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
wxString argument;
const wxChar *cptr = command.c_str();
wxChar quotechar = wxT('\0'); // is arg quoted?
bool escaped = FALSE;
bool escaped = false;
// split the command line in arguments
do
@@ -278,14 +278,14 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
{
if ( *cptr == wxT('\\') && ! escaped )
{
escaped = TRUE;
escaped = true;
cptr++;
continue;
}
// all other characters:
argument += *cptr++;
escaped = FALSE;
escaped = false;
// have we reached the end of the argument?
if ( (*cptr == quotechar && ! escaped)
@@ -348,7 +348,7 @@ bool wxShell(const wxString& command)
bool wxShell(const wxString& command, wxArrayString& output)
{
wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );
wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );
return wxExecute(wxMakeShellCommand(command), output);
}
@@ -369,7 +369,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
default:
wxFAIL_MSG( _T("unknown wxShutdown() flag") );
return FALSE;
return false;
}
return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
@@ -385,7 +385,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
return FALSE;
return false;
// check if there is any input available
struct timeval tv;
@@ -404,7 +404,7 @@ bool wxPipeInputStream::CanRead() const
// fall through
case 0:
return FALSE;
return false;
default:
wxFAIL_MSG(_T("unexpected select() return value"));
@@ -724,7 +724,7 @@ char *wxGetUserHome( const wxString &user )
// private use only)
static bool wxGetHostNameInternal(wxChar *buf, int sz)
{
wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") );
wxCHECK_MSG( buf, false, wxT("NULL pointer in wxGetHostNameInternal") );
*buf = wxT('\0');
@@ -742,7 +742,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
#else // no uname, no gethostname
wxFAIL_MSG(wxT("don't know host name for this machine"));
bool ok = FALSE;
bool ok = false;
#endif // uname/gethostname
if ( !ok )
@@ -785,7 +785,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
{
wxLogSysError(_("Cannot get the official hostname"));
ok = FALSE;
ok = false;
}
else
{
@@ -807,10 +807,10 @@ bool wxGetUserId(wxChar *buf, int sz)
if ((who = getpwuid(getuid ())) != NULL)
{
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
return TRUE;
return true;
}
return FALSE;
return false;
}
bool wxGetUserName(wxChar *buf, int sz)
@@ -829,10 +829,10 @@ bool wxGetUserName(wxChar *buf, int sz)
#else // !HAVE_PW_GECOS
wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
return TRUE;
return true;
}
return FALSE;
return false;
}
// this function is in mac/utils.cpp for wxMac
@@ -863,7 +863,7 @@ unsigned long wxGetProcessId()
return (unsigned long)getpid();
}
long wxGetFreeMemory()
wxMemorySize wxGetFreeMemory()
{
#if defined(__LINUX__)
// get it from /proc/meminfo
@@ -881,10 +881,10 @@ long wxGetFreeMemory()
fclose(fp);
return memFree;
return (wxMemorySize)memFree;
}
#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
#endif
@@ -901,7 +901,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
{
wxLogSysError( wxT("Failed to get file system statistics") );
return FALSE;
return false;
}
// under Solaris we also have to use f_frsize field instead of f_bsize
@@ -922,9 +922,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
*pFree = wxLongLong(fs.f_bavail) * blockSize;
}
return TRUE;
return true;
#else // !HAVE_STATFS && !HAVE_STATVFS
return FALSE;
return false;
#endif // HAVE_STATFS
}
@@ -937,14 +937,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
// wxGetenv is defined as getenv()
wxChar *p = wxGetenv(var);
if ( !p )
return FALSE;
return false;
if ( value )
{
*value = p;
}
return TRUE;
return true;
}
bool wxSetEnv(const wxString& variable, const wxChar *value)
@@ -994,13 +994,13 @@ extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
bool wxHandleFatalExceptions(bool doit)
{
// old sig handlers
static bool s_savedHandlers = FALSE;
static bool s_savedHandlers = false;
static struct sigaction s_handlerFPE,
s_handlerILL,
s_handlerBUS,
s_handlerSEGV;
bool ok = TRUE;
bool ok = true;
if ( doit && !s_savedHandlers )
{
// install the signal handler
@@ -1022,7 +1022,7 @@ bool wxHandleFatalExceptions(bool doit)
wxLogDebug(_T("Failed to install our signal handler."));
}
s_savedHandlers = TRUE;
s_savedHandlers = true;
}
else if ( s_savedHandlers )
{
@@ -1036,7 +1036,7 @@ bool wxHandleFatalExceptions(bool doit)
wxLogDebug(_T("Failed to uninstall our signal handler."));
}
s_savedHandlers = FALSE;
s_savedHandlers = false;
}
//else: nothing to do