From 9d8aca4832f9052729d2fc51d25c23f6d7006cab Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Mon, 27 Dec 2004 18:47:26 +0000
Subject: [PATCH] Take best fitting type for available memory measurement.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/function.tex |  36 +-
 include/wx/utils.h         |  14 +-
 src/mac/carbon/utils.cpp   | 268 +++++++--------
 src/mac/classic/utils.cpp  | 650 ++++++++++++++++++-------------------
 src/msw/utils.cpp          |  43 +--
 src/os2/utils.cpp          |  28 +-
 src/palmos/utils.cpp       |   8 +-
 src/unix/utilsunx.cpp      |  52 +--
 8 files changed, 558 insertions(+), 541 deletions(-)

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 221cdc7b50..ad14fa41f1 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -315,7 +315,7 @@ the following can be done:
 
 \func{bool}{wxCHECK\_VERSION\_FULL}{\param{}{major, minor, release, subrel}}
 
-Same as \helpref{wxCHECK\_VERSION}{wxcheckversion} but also checks that 
+Same as \helpref{wxCHECK\_VERSION}{wxcheckversion} but also checks that
 \texttt{wxSUBRELEASE\_NUMBER} is at least \arg{subrel}.
 
 
@@ -530,7 +530,7 @@ an array reference.}
 
 \func{long}{wxExecute}{\param{const wxString\& }{command}, \param{wxArrayString\& }{output}, \param{wxArrayString\& }{errors}, \param{int }{flags = 0}}
 
-\perlnote{In wxPerl this function is called \texttt{Wx::ExecuteStdoutStderr} 
+\perlnote{In wxPerl this function is called \texttt{Wx::ExecuteStdoutStderr}
 and it only takes the {\tt command} argument,
 and returns a 3-element list {\tt ( status, output, errors )}, where
 {\tt output} and {\tt errors} are array references.}
@@ -585,7 +585,7 @@ will kill this process as well as all of its children (except those which have
 started their own session).
 
 Finally, you may use the third overloaded version of this function to execute
-a process (always synchronously, the contents of \arg{flags} is or'd with 
+a process (always synchronously, the contents of \arg{flags} is or'd with
 \texttt{wxEXEC\_SYNC}) and capture its output in the array \arg{output}. The
 fourth version adds the possibility to additionally capture the messages from
 standard error output in the \arg{errors} array.
@@ -661,7 +661,7 @@ enum wxSignal
 \end{verbatim}
 
 {\tt wxSIGNONE}, {\tt wxSIGKILL} and {\tt wxSIGTERM} have the same meaning
-under both Unix and Windows but all the other signals are equivalent to 
+under both Unix and Windows but all the other signals are equivalent to
 {\tt wxSIGTERM} under Windows.
 
 Returns 0 on success, -1 on failure. If {\it rc} parameter is not NULL, it will
@@ -771,7 +771,7 @@ to create and use the critical section only when needed.
 
 \func{}{wxCRIT\_SECT\_DECLARE}{\param{}{cs}}
 
-This macro declares a (static) critical section object named {\it cs} if 
+This macro declares a (static) critical section object named {\it cs} if
 {\tt wxUSE\_THREADS} is $1$ and does nothing if it is $0$.
 
 
@@ -780,9 +780,9 @@ This macro declares a (static) critical section object named {\it cs} if
 
 \func{}{wxCRIT\_SECT\_DECLARE}{\param{}{cs}}
 
-This macro declares a critical section object named {\it cs} if 
+This macro declares a critical section object named {\it cs} if
 {\tt wxUSE\_THREADS} is $1$ and does nothing if it is $0$. As it doesn't
-include the {\tt static} keyword (unlike 
+include the {\tt static} keyword (unlike
 \helpref{wxCRIT\_SECT\_DECLARE}{wxcritsectdeclare}), it can be used to declare
 a class or struct member which explains its name.
 
@@ -792,8 +792,8 @@ a class or struct member which explains its name.
 
 \func{}{wxCRIT\_SECT\_LOCKER}{\param{}{name}, \param{}{cs}}
 
-This macro creates a \helpref{critical section lock}{wxcriticalsectionlocker} 
-object named {\it name} and associated with the critical section {\it cs} if 
+This macro creates a \helpref{critical section lock}{wxcriticalsectionlocker}
+object named {\it name} and associated with the critical section {\it cs} if
 {\tt wxUSE\_THREADS} is $1$ and does nothing if it is $0$.
 
 
@@ -802,7 +802,7 @@ object named {\it name} and associated with the critical section {\it cs} if
 
 \func{}{wxCRITICAL\_SECTION}{\param{}{name}}
 
-This macro combines \helpref{wxCRIT\_SECT\_DECLARE}{wxcritsectdeclare} and 
+This macro combines \helpref{wxCRIT\_SECT\_DECLARE}{wxcritsectdeclare} and
 \helpref{wxCRIT\_SECT\_LOCKER}{wxcritsectlocker}: it creates a static critical
 section object and also the lock object associated with it. Because of this, it
 can be only used inside a function, not at global scope. For example:
@@ -820,7 +820,7 @@ int IncCount()
 
 (note that we suppose that the function is called the first time from the main
 thread so that the critical section object is initialized correctly by the time
-other threads start calling it, if this is not the case this approach can 
+other threads start calling it, if this is not the case this approach can
 {\bf not} be used and the critical section must be made a global instead).
 
 
@@ -829,7 +829,7 @@ other threads start calling it, if this is not the case this approach can
 
 \func{}{wxENTER\_CRIT\_SECT}{\param{wxCriticalSection\& }{cs}}
 
-This macro is equivalent to \helpref{cs.Enter()}{wxcriticalsectionenter} if 
+This macro is equivalent to \helpref{cs.Enter()}{wxcriticalsectionenter} if
 {\tt wxUSE\_THREADS} is $1$ and does nothing if it is $0$.
 
 
@@ -847,7 +847,7 @@ Returns {\tt true} if this thread is the main one. Always returns {\tt true} if
 
 \func{}{wxLEAVE\_CRIT\_SECT}{\param{wxCriticalSection\& }{cs}}
 
-This macro is equivalent to \helpref{cs.Leave()}{wxcriticalsectionleave} if 
+This macro is equivalent to \helpref{cs.Leave()}{wxcriticalsectionleave} if
 {\tt wxUSE\_THREADS} is $1$ and does nothing if it is $0$.
 
 
@@ -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
@@ -1379,7 +1379,7 @@ Gets operating system version information.
 
 \begin{twocollist}\itemsep=0pt
 \twocolitemruled{Platform}{Return types}
-\twocolitem{Mac OS}{Return value is wxMAC when compiled with CodeWarrior under Mac OS 8.x/9.x and Mac OS X, wxMAC\_DARWIN when compiled with the Apple Developer Tools under Mac OS X. 
+\twocolitem{Mac OS}{Return value is wxMAC when compiled with CodeWarrior under Mac OS 8.x/9.x and Mac OS X, wxMAC\_DARWIN when compiled with the Apple Developer Tools under Mac OS X.
 
 Both {\it major} and {\it minor} have to be looked at as hexadecimal numbers. So System 10.2.4 returns 0x10, resp 16 for {\it major} and 0x24, resp 36 for {\it minor}. }
 \twocolitem{GTK}{Return value is wxGTK, For GTK 1.0, {\it major} is 1, {\it minor} is 0. }
@@ -1572,7 +1572,7 @@ enough space.
 
 wxT() is a macro which can be used with character and string literals (in other
 words, {\tt 'x'} or {\tt "foo"}) to automatically convert them to Unicode in
-Unicode build configuration. Please see the 
+Unicode build configuration. Please see the
 \helpref{Unicode overview}{unicode} for more information.
 
 This macro is simply returns the value passed to it without changes in ASCII
@@ -1591,14 +1591,14 @@ build. In fact, its definition is:
 \func{const wxChar *}{wxTRANSLATE}{\param{const char *}{s}}
 
 This macro doesn't do anything in the program code -- it simply expands to the
-value of its argument (except in Unicode build where it is equivalent to 
+value of its argument (except in Unicode build where it is equivalent to
 \helpref{wxT}{wxt} which makes it unnecessary to use both wxTRANSLATE and wxT
 with the same string which would be really unreadable).
 
 However it does have a purpose and it is to mark the literal strings for the
 extraction into the message catalog created by {\tt xgettext} program. Usually
 this is achieved using \helpref{\_()}{underscore} but that macro not only marks
-the string for extraction but also expands into a 
+the string for extraction but also expands into a
 \helpref{wxGetTranslation}{wxgettranslation} function call which means that it
 cannot be used in some situations, notably for static array
 initialization.
diff --git a/include/wx/utils.h b/include/wx/utils.h
index bca3d0be0a..b783dc25d6 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -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);
diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 593223fd7f..44e917e2a7 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -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);
@@ -521,7 +521,7 @@ wxString wxMacFindFolder( short        vol,
               OSType       folderType,
               Boolean      createFolder)
 {
-    FSRef fsRef ;    
+    FSRef fsRef ;
     wxString strDir ;
 
     if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
@@ -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] == ':' ) {
@@ -659,7 +659,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     p = p + wxT(":") ;
 
     OSErr err = noErr ;
-    
+
     FSRef fsRef ;
     err = wxMacPathToFSRef( p , &fsRef ) ;
     if ( noErr == err )
@@ -672,14 +672,14 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
             err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
             if ( noErr == err )
             {
-                if ( pTotal ) 
+                if ( pTotal )
                     *pTotal = wxLongLong( totalBytes ) ;
                 if ( pFree )
                     *pFree = wxLongLong( freeBytes ) ;
             }
         }
     }
-    
+
     return err == noErr ;
 }
 #endif // !__DARWIN__
@@ -732,7 +732,7 @@ void wxMacWakeUp()
         if ( err == noErr )
         {
             if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
-                return ;     
+                return ;
             s_wakeupEvent.SetTime(0) ;
             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
                                   kEventPriorityHigh);
@@ -759,12 +759,12 @@ void wxMacWakeUp()
 
 OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
 {
-    return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;   
+    return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;
 }
 
 OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
 {
-    return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;   
+    return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -777,45 +777,45 @@ void wxMacControl::Dispose()
     m_controlRef = NULL ;
 }
 
-void wxMacControl::SetReference( SInt32 data ) 
+void wxMacControl::SetReference( SInt32 data )
 {
     SetControlReference( m_controlRef , data ) ;
 }
 
 OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
 {
-    return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;   
+    return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;
 }
 
 OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
 {
-    return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;   
+    return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;
 }
 
 OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
 {
-    return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;   
+    return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;
 }
 
-OSStatus wxMacControl::SendEvent(  EventRef event , OptionBits inOptions ) 
+OSStatus wxMacControl::SendEvent(  EventRef event , OptionBits inOptions )
 {
 #if TARGET_API_MAC_OSX
-    return SendEventToEventTargetWithOptions( event, 
-        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );        
+    return SendEventToEventTargetWithOptions( event,
+        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );
 #else
-    #pragma unused(inOptions) 
+    #pragma unused(inOptions)
     return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
 #endif
 }
 
-OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions ) 
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
 {
     wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;
     event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
-    return SendEvent( event , inOptions ) ;     
+    return SendEvent( event , inOptions ) ;
 }
 
-OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  ) 
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  )
 {
     HICommand command ;
     memset( &command, 0 , sizeof(command) ) ;
@@ -823,7 +823,7 @@ OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  )
     return SendHICommand( command , inOptions ) ;
 }
 
-void wxMacControl::Flash( ControlPartCode part , UInt32 ticks ) 
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
 {
     HiliteControl( m_controlRef , part ) ;
     unsigned long finalTicks ;
@@ -832,86 +832,86 @@ void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
 }
 
 SInt32 wxMacControl::GetValue() const
-{ 
-    return ::GetControl32BitValue( m_controlRef ) ; 
+{
+    return ::GetControl32BitValue( m_controlRef ) ;
 }
 
 SInt32 wxMacControl::GetMaximum() const
-{ 
-    return ::GetControl32BitMaximum( m_controlRef ) ; 
+{
+    return ::GetControl32BitMaximum( m_controlRef ) ;
 }
 
 SInt32 wxMacControl::GetMinimum() const
-{ 
-    return ::GetControl32BitMinimum( m_controlRef ) ; 
+{
+    return ::GetControl32BitMinimum( m_controlRef ) ;
 }
 
-void wxMacControl::SetValue( SInt32 v ) 
-{ 
-    ::SetControl32BitValue( m_controlRef , v ) ; 
+void wxMacControl::SetValue( SInt32 v )
+{
+    ::SetControl32BitValue( m_controlRef , v ) ;
 }
 
-void wxMacControl::SetMinimum( SInt32 v ) 
-{ 
-    ::SetControl32BitMinimum( m_controlRef , v ) ; 
+void wxMacControl::SetMinimum( SInt32 v )
+{
+    ::SetControl32BitMinimum( m_controlRef , v ) ;
 }
 
-void wxMacControl::SetMaximum( SInt32 v ) 
-{ 
+void wxMacControl::SetMaximum( SInt32 v )
+{
     ::SetControl32BitMaximum( m_controlRef , v ) ;
 }
 
 void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
 {
     ::SetControl32BitMinimum( m_controlRef , minimum ) ;
-    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
+    ::SetControl32BitMaximum( m_controlRef , maximum ) ;
     ::SetControl32BitValue( m_controlRef , value ) ;
 }
 
-OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart ) 
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
 {
-    return SetKeyboardFocus(  GetControlOwner( m_controlRef )  , 
+    return SetKeyboardFocus(  GetControlOwner( m_controlRef )  ,
         m_controlRef , focusPart ) ;
 }
 
-bool wxMacControl::HasFocus() const 
+bool wxMacControl::HasFocus() const
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_controlRef ;
 }
 
-bool wxMacControl::NeedsFocusRect() const 
+bool wxMacControl::NeedsFocusRect() const
 {
     return false ;
 }
 
-void wxMacControl::VisibilityChanged(bool shown) 
+void wxMacControl::VisibilityChanged(bool shown)
 {
 }
 
-void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) 
+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 ;
@@ -920,32 +920,32 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
     else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
         fontStyle.just = teJustRight ;
 
-    
+
     // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
     // won't get grayed out by the system anymore
-    
+
     if ( foreground != *wxBLACK )
     {
         fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
         fontStyle.flags |= kControlUseForeColorMask ;
     }
-	
-	::SetControlFontStyle( m_controlRef , &fontStyle );
+
+    ::SetControlFontStyle( m_controlRef , &fontStyle );
 }
 
-void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) ) 
+void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
 {
-    // TODO 
+    // TODO
     // setting up a color proc is not recommended anymore
 }
 
 void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
 {
     ::SetControl32BitMinimum( m_controlRef , minimum ) ;
-    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
+    ::SetControl32BitMaximum( m_controlRef , maximum ) ;
 }
 
-short wxMacControl::HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) 
+short wxMacControl::HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers )
 {
     return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
 }
@@ -965,17 +965,17 @@ SInt32 wxMacControl::GetViewSize() const
     return GetControlViewSize( m_controlRef ) ;
 }
 
-bool wxMacControl::IsVisible() const 
+bool wxMacControl::IsVisible() const
 {
     return IsControlVisible( m_controlRef ) ;
 }
 
-void wxMacControl::SetVisibility( bool visible , bool redraw ) 
+void wxMacControl::SetVisibility( bool visible , bool redraw )
 {
     SetControlVisibility( m_controlRef , visible , redraw ) ;
 }
 
-bool wxMacControl::IsEnabled() const 
+bool wxMacControl::IsEnabled() const
 {
 #if TARGET_API_MAC_OSX
     return IsControlEnabled( m_controlRef ) ;
@@ -984,12 +984,12 @@ bool wxMacControl::IsEnabled() const
 #endif
 }
 
-bool wxMacControl::IsActive() const 
+bool wxMacControl::IsActive() const
 {
     return IsControlActive( m_controlRef ) ;
 }
 
-void wxMacControl::Enable( bool enable ) 
+void wxMacControl::Enable( bool enable )
 {
 #if TARGET_API_MAC_OSX
     if ( enable )
@@ -1004,14 +1004,14 @@ void wxMacControl::Enable( bool enable )
 #endif
 }
 
-void wxMacControl::SetDrawingEnabled( bool enable ) 
+void wxMacControl::SetDrawingEnabled( bool enable )
 {
 #if TARGET_API_MAC_OSX
     HIViewSetDrawingEnabled( m_controlRef , enable ) ;
 #endif
 }
 
-bool wxMacControl::GetNeedsDisplay() const 
+bool wxMacControl::GetNeedsDisplay() const
 {
 #if TARGET_API_MAC_OSX
     return HIViewGetNeedsDisplay( m_controlRef ) ;
@@ -1020,7 +1020,7 @@ bool wxMacControl::GetNeedsDisplay() const
 #endif
 }
 
-void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where ) 
+void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
 {
 #if TARGET_API_MAC_OSX
     if ( where != NULL )
@@ -1030,7 +1030,7 @@ void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
 #endif
 }
 
-void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) 
+void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
 {
 #if TARGET_API_MAC_OSX
     HIPoint hiPoint ;
@@ -1042,11 +1042,11 @@ void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to
 #endif
 }
 
-void wxMacControl::SetRect( Rect *r ) 
+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
@@ -1055,23 +1055,23 @@ void wxMacControl::SetRect( Rect *r )
 
 }
 
-void wxMacControl::GetRect( Rect *r ) 
+void wxMacControl::GetRect( Rect *r )
 {
     GetControlBounds( m_controlRef , r ) ;
 }
 
-void wxMacControl::GetRectInWindowCoords( Rect *r ) 
+void wxMacControl::GetRectInWindowCoords( Rect *r )
 {
     UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
 }
 
-void wxMacControl::GetBestRect( Rect *r ) 
+void wxMacControl::GetBestRect( Rect *r )
 {
     short   baselineoffset ;
     GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
 }
 
-void wxMacControl::SetTitle( const wxString &title ) 
+void wxMacControl::SetTitle( const wxString &title )
 {
     wxFontEncoding encoding;
 
@@ -1079,7 +1079,7 @@ void wxMacControl::SetTitle( const wxString &title )
         encoding = m_font.GetEncoding();
     else
         encoding = wxFont::GetDefaultEncoding();
-    
+
     UMASetControlTitle(  m_controlRef , title , encoding ) ;
 }
 
@@ -1088,15 +1088,15 @@ void wxMacControl::GetFeatures( UInt32 * features )
     GetControlFeatures( m_controlRef , features ) ;
 }
 
-OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) 
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
 {
     return GetControlRegion( m_controlRef , partCode , region ) ;
 }
 
-OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other ) 
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
 {
 #if TARGET_API_MAC_OSX
-    return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow, 
+    return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
        (other != NULL) ? other->m_controlRef : NULL) ;
 #else
     return 0 ;
@@ -1110,7 +1110,7 @@ static void InvalidateControlAndChildren( HIViewRef control )
 {
     HIViewSetNeedsDisplay( control , true ) ;
     UInt16 childrenCount = 0 ;
-    OSStatus err = CountSubControls( control , &childrenCount ) ; 
+    OSStatus err = CountSubControls( control , &childrenCount ) ;
     if ( err == errControlIsNotEmbedder )
         return ;
     wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
@@ -1126,14 +1126,14 @@ static void InvalidateControlAndChildren( HIViewRef control )
 }
 #endif
 
-void wxMacControl::InvalidateWithChildren() 
+void wxMacControl::InvalidateWithChildren()
 {
 #if TARGET_API_MAC_OSX
     InvalidateControlAndChildren( m_controlRef ) ;
 #endif
 }
 
-void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy ) 
+void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
 {
 #if TARGET_API_MAC_OSX
     HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
@@ -1148,13 +1148,13 @@ void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
 // Databrowser
 //
 
-OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options ) 
+OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )
 {
     return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
 }
 
 OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
-        DataBrowserTableViewColumnIndex position ) 
+        DataBrowserTableViewColumnIndex position )
 {
     return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
 }
@@ -1164,7 +1164,7 @@ OSStatus wxMacControl::AutoSizeListViewColumns()
     return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
 }
 
-OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert ) 
+OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )
 {
     return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
 }
@@ -1174,58 +1174,58 @@ OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle
     return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
 }
 
-OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height) 
+OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)
 {
     return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
 }
 
-OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks *  callbacks) 
+OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks *  callbacks)
 {
     return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
 }
 
 OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
-        const DataBrowserItemID* items,                
+        const DataBrowserItemID* items,
         DataBrowserPropertyID preSortProperty,
-        DataBrowserPropertyID propertyID ) 
+        DataBrowserPropertyID propertyID )
 {
     return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
 }
 
-bool wxMacControl::IsItemSelected( DataBrowserItemID item ) 
+bool wxMacControl::IsItemSelected( DataBrowserItemID item )
 {
     return IsDataBrowserItemSelected( m_controlRef , item ) ;
 }
 
 OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,                
-            DataBrowserPropertyID preSortProperty ) 
+            const DataBrowserItemID* items,
+            DataBrowserPropertyID preSortProperty )
 {
     return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
 }
 
 OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,                
-            DataBrowserPropertyID preSortProperty ) 
+            const DataBrowserItemID* items,
+            DataBrowserPropertyID preSortProperty )
 {
     return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
 }
 
 OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
             DataBrowserPropertyID propertyID,
-            DataBrowserRevealOptions options ) 
+            DataBrowserRevealOptions options )
 {
     return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
 }
 
 OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
             const DataBrowserItemID * items,
-            DataBrowserSetOption operation ) 
+            DataBrowserSetOption operation )
 {
     return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
 }
 
-OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) 
+OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last )
 {
     return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
 }
@@ -1233,11 +1233,11 @@ OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowse
 //
 // Tab Control
 //
- 
-OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) 
+
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
 {
     return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
 }
- 
+
 #endif // wxUSE_GUI
 
diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index 09ed7ad31f..e290dc06e5 100644
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -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] == ':' ) {
@@ -578,147 +578,147 @@ 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 ;
-
-		case wxFONTENCODING_KOI8 :
-    		enc = kTextEncodingKOI8_R;
-    		break ;
-		case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
-    		enc = kTextEncodingDOSRussian;
-    		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_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_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_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_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_MACROMAN :
             enc = kTextEncodingMacRoman ;
@@ -839,145 +839,145 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
             break ;
         case wxFONTENCODING_MACKEYBOARD :
             enc = kTextEncodingMacKeyboardGlyphs ;
-            break ;    
-		default :
-			// to make gcc happy
-			break ;
-	} ;
-	return enc ;
+            break ;
+        default :
+            // to make gcc happy
+            break ;
+    } ;
+    return enc ;
 }
 
 wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
-{    	
-	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 ;
-
-		case kTextEncodingKOI8_R :
-    		enc = wxFONTENCODING_KOI8;
-    		break ;
+{
+    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 ;
+
+        case kTextEncodingKOI8_R :
+            enc = wxFONTENCODING_KOI8;
+            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 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  :
+            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 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 ;
@@ -1098,9 +1098,9 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
             break ;
         case kTextEncodingMacKeyboardGlyphs :
             enc = wxFONTENCODING_MACKEYBOARD ;
-            break ;       
-	} ;
-	return enc ;
+            break ;
+    } ;
+    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 ) ;
@@ -1146,18 +1146,18 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
     Size cflen = CFStringGetLength( m_cfs )  ;
     size_t noChars ;
     wxChar* buf = NULL ;
-    
+
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
-    buf = new wxChar[ cflen + 1 ] ; 
+    buf = new wxChar[ cflen + 1 ] ;
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) buf ) ;
     noChars = cflen ;
 #else
     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 ;
@@ -1166,7 +1166,7 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
     CFIndex cStrLen ;
     CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
         '?' , false , NULL , 0 , &cStrLen ) ;
-    buf = new wxChar[ cStrLen + 1 ] ; 
+    buf = new wxChar[ cStrLen + 1 ] ;
     CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
     noChars = cStrLen ;
@@ -1181,9 +1181,9 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 
 #endif //TARGET_CARBON
 
-void wxMacConvertNewlines13To10( char * data ) 
-{        
-	char * buf = data ;
+void wxMacConvertNewlines13To10( char * data )
+{
+    char * buf = data ;
     while( (buf=strchr(buf,0x0d)) != NULL )
     {
         *buf = 0x0a ;
@@ -1192,8 +1192,8 @@ void wxMacConvertNewlines13To10( char * data )
 }
 
 void wxMacConvertNewlines10To13( char * data )
-{        
-	char * buf = data ;
+{
+    char * buf = data ;
     while( (buf=strchr(buf,0x0a)) != NULL )
     {
         *buf = 0x0d ;
@@ -1201,22 +1201,22 @@ void wxMacConvertNewlines10To13( char * data )
     }
 }
 
-void wxMacConvertNewlines13To10( wxString * data ) 
-{        
+void wxMacConvertNewlines13To10( wxString * data )
+{
     size_t len = data->Length() ;
 
     if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
         return ;
-        
+
     wxString temp(*data) ;
     wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
+    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
 
-	wxMacConvertNewlines13To10( buf ) ;
+    wxMacConvertNewlines13To10( buf ) ;
 }
 
 void wxMacConvertNewlines10To13( wxString * data )
-{        
+{
     size_t len = data->Length() ;
 
     if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
@@ -1224,15 +1224,15 @@ void wxMacConvertNewlines10To13( wxString * data )
 
     wxString temp(*data) ;
     wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
-	wxMacConvertNewlines10To13( buf ) ;
+    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
+    wxMacConvertNewlines10To13( buf ) ;
 }
 
 
 #if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data ) 
-{        
-	wxChar * buf = data ;
+void wxMacConvertNewlines13To10( wxChar * data )
+{
+    wxChar * buf = data ;
     while( (buf=wxStrchr(buf,0x0d)) != NULL )
     {
         *buf = 0x0a ;
@@ -1241,8 +1241,8 @@ void wxMacConvertNewlines13To10( wxChar * data )
 }
 
 void wxMacConvertNewlines10To13( wxChar * data )
-{        
-	wxChar * buf =  data ;
+{
+    wxChar * buf =  data ;
     while( (buf=wxStrchr(buf,0x0a)) != NULL )
     {
         *buf = 0x0d ;
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 901aa039ed..adda6f911c 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -658,7 +658,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
 {
     if (flags & wxKILL_CHILDREN)
         wxKillAllChildren(pid, sig, krc);
-    
+
     // get the process handle to operate on
     HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
                                     PROCESS_TERMINATE |
@@ -816,24 +816,24 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
 HANDLE (WINAPI *lpfCreateToolhelp32Snapshot)(DWORD,DWORD) ;
 BOOL (WINAPI *lpfProcess32First)(HANDLE,LPPROCESSENTRY32) ;
 BOOL (WINAPI *lpfProcess32Next)(HANDLE,LPPROCESSENTRY32) ;
-  
+
 static void InitToolHelp32()
 {
     static bool s_initToolHelpDone = false;
-    
+
     if (s_initToolHelpDone)
         return;
-    
+
     s_initToolHelpDone = true;
 
     lpfCreateToolhelp32Snapshot = NULL;
     lpfProcess32First = NULL;
     lpfProcess32Next = NULL;
-    
+
     HINSTANCE hInstLib = LoadLibrary( wxT("Kernel32.DLL") ) ;
     if( hInstLib == NULL )
         return ;
-    
+
     // Get procedure addresses.
     // We are linking to these functions of Kernel32
     // explicitly, because otherwise a module using
@@ -849,7 +849,7 @@ static void InitToolHelp32()
         "CreateToolhelp32Snapshot"
 #endif
         ) ;
-    
+
     lpfProcess32First=
         (BOOL(WINAPI *)(HANDLE,LPPROCESSENTRY32))
         GetProcAddress( hInstLib,
@@ -877,14 +877,14 @@ static void InitToolHelp32()
 int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc)
 {
     InitToolHelp32();
-    
+
     if (krc)
         *krc = wxKILL_OK;
-    
+
     // If not implemented for this platform (e.g. NT 4.0), silently ignore
     if (!lpfCreateToolhelp32Snapshot || !lpfProcess32First || !lpfProcess32Next)
         return 0;
-    
+
     // Take a snapshot of all processes in the system.
     HANDLE hProcessSnap = lpfCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
     if (hProcessSnap == INVALID_HANDLE_VALUE) {
@@ -892,11 +892,11 @@ int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc)
             *krc = wxKILL_ERROR;
         return -1;
     }
-    
+
     //Fill in the size of the structure before using it.
     PROCESSENTRY32 pe = {0};
     pe.dwSize = sizeof(PROCESSENTRY32);
-    
+
     // Walk the snapshot of the processes, and for each process,
     // kill it if its parent is pid.
     if (!lpfProcess32First(hProcessSnap, &pe)) {
@@ -906,15 +906,15 @@ int wxKillAllChildren(long pid, wxSignal sig, wxKillError *krc)
         CloseHandle (hProcessSnap);
         return -1;
     }
-    
+
     do {
         if (pe.th32ParentProcessID == (DWORD) pid) {
             if (wxKill(pe.th32ProcessID, sig, krc))
                 return -1;
         }
     } while (lpfProcess32Next (hProcessSnap, &pe));
-    
-    
+
+
     return 0;
 }
 
@@ -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
 }
 
diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index eb3424d29d..678f7c0edc 100644
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -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
diff --git a/src/palmos/utils.cpp b/src/palmos/utils.cpp
index 71db037551..db8ce72357 100644
--- a/src/palmos/utils.cpp
+++ b/src/palmos/utils.cpp
@@ -4,7 +4,7 @@
 // Author:      William Osborne
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
 
     wxStrncpy (buf, wxConvertMB2WX(id), maxSize - 1);
 
-    // free the buffer 
+    // free the buffer
     MemPtrUnlock(id);
 
     return true;
@@ -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()
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 89dd3e65a8..bbaea579b4 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -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
 
-- 
2.50.0

