alpha support for Scale added

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index baa5a937af9b20cbb340b6a5ea2ff8a9e0d26bb4..c20126d12cb84fac07938b4f8c7713c7f472e58e 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -9,21 +9,22 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 // Note: this is done in utilscmn.cpp now.
 // #pragma implementation "utils.h"
 #endif
 
 // Note: this is done in utilscmn.cpp now.
 // #pragma implementation "utils.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"
+

 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI
     #include "wx/mac/uma.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI
     #include "wx/mac/uma.h"

-       #include "wx/font.h"
+    #include "wx/font.h"

 #else
 #else

-       #include "wx/intl.h"
+    #include "wx/intl.h"

 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>


@@ -260,7 +261,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
     else
         buf[0] = 0 ;
 
     else
         buf[0] = 0 ;
 

-  return TRUE;
+    return true;

 }
 
 // Get user ID e.g. jacs
 }
 
 // Get user ID e.g. jacs


@@ -298,7 +299,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     else
         buf[0] = 0 ;
 
     else
         buf[0] = 0 ;
 

-  return TRUE;
+    return true;

 }
 
 int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)
 }
 
 int wxKill(long pid, wxSignal sig , wxKillError *rc, int flags)


@@ -313,7 +314,7 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
     return false ;
 }
 
     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
 WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 {
     // TODO : under classic there is no environement support, under X yes


@@ -326,34 +327,46 @@ WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
 bool wxShell(const wxString& command)
 {
     // TODO
 bool wxShell(const wxString& command)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Shutdown or reboot the PC
 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO
 }
 
 // Shutdown or reboot the PC
 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO

-    return FALSE;
+    return false;
+}
+
+wxPowerType wxGetPowerType()
+{
+    // TODO
+    return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+    // TODO
+    return wxBATTERY_UNKNOWN_STATE;

 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 }
 
 // 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)
 {
 }
 
 #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)
 {
 }
 
 void wxMilliSleep(unsigned long milliseconds)
 {

-       AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
-       MPDelayUntil( & wakeup);
+    AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
+    MPDelayUntil( & wakeup);

 }
 
 void wxSleep(int nSecs)
 }
 
 void wxSleep(int nSecs)


@@ -406,7 +419,7 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
     // TODO
 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)
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)


@@ -436,7 +449,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
 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)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)


@@ -447,9 +460,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
     {
         *value = (float)strtod(s, NULL);
         delete[] s;
     {
         *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)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)


@@ -460,9 +473,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
     {
         *value = strtol(s, NULL, 10);
         delete[] s;
     {
         *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)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)


@@ -473,9 +486,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     {
         *value = (int)strtol(s, NULL, 10);
         delete[] s;
     {
         *value = (int)strtol(s, NULL, 10);
         delete[] s;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 }
 #endif // wxUSE_RESOURCES
 
 }
 #endif // wxUSE_RESOURCES
 


@@ -507,7 +520,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);
 bool wxIsBusy()
 {
     return (gs_wxBusyCursorCount > 0);


@@ -521,7 +534,7 @@ wxString wxMacFindFolder( short        vol,
               OSType       folderType,
               Boolean      createFolder)
 {
               OSType       folderType,
               Boolean      createFolder)
 {

-    FSRef fsRef ;    
+    FSRef fsRef ;

     wxString strDir ;
 
     if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
     wxString strDir ;
 
     if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)


@@ -539,7 +552,7 @@ wxString wxMacFindFolder( short        vol,
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
     // TODO
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 void wxGetMousePosition( int* x, int* y )
 }
 
 void wxGetMousePosition( int* x, int* y )


@@ -552,10 +565,10 @@ void wxGetMousePosition( int* x, int* y )
     *y = pt.v ;
 };
 
     *y = pt.v ;
 };
 

-// Return TRUE if we have a colour display
+// Return true if we have a colour display

 bool wxColourDisplay()
 {
 bool wxColourDisplay()
 {

-    return TRUE;
+    return true;

 }
 
 // Returns depth of screen
 }
 
 // Returns depth of screen


@@ -644,7 +657,7 @@ wxChar *wxGetUserHome (const wxString& user)
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )

-        return FALSE;
+        return false;

 
     wxString p = path ;
     if (p[0u] == ':' ) {
 
     wxString p = path ;
     if (p[0u] == ':' ) {


@@ -659,7 +672,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     p = p + wxT(":") ;
 
     OSErr err = noErr ;
     p = p + wxT(":") ;
 
     OSErr err = noErr ;

-    
+

     FSRef fsRef ;
     err = wxMacPathToFSRef( p , &fsRef ) ;
     if ( noErr == err )
     FSRef fsRef ;
     err = wxMacPathToFSRef( p , &fsRef ) ;
     if ( noErr == err )


@@ -672,14 +685,14 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
             err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
             if ( noErr == err )
             {
             err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
             if ( noErr == err )
             {

-                if ( pTotal ) 
+                if ( pTotal )

                     *pTotal = wxLongLong( totalBytes ) ;
                 if ( pFree )
                     *pFree = wxLongLong( freeBytes ) ;
             }
         }
     }
                     *pTotal = wxLongLong( totalBytes ) ;
                 if ( pFree )
                     *pFree = wxLongLong( freeBytes ) ;
             }
         }
     }

-    
+

     return err == noErr ;
 }
 #endif // !__DARWIN__
     return err == noErr ;
 }
 #endif // !__DARWIN__


@@ -722,27 +735,21 @@ void wxMacWakeUp()
     if ( isSame )
     {
 #if TARGET_CARBON
     if ( isSame )
     {
 #if TARGET_CARBON

-        // we keep the reference only as a weak ref, to avoid double posting
-        // wakeups, so no problem if it is stale
-        
-        static EventRef s_wakeupEvent = 0 ;
-        if ( s_wakeupEvent )
+        static wxMacCarbonEvent s_wakeupEvent ;
+        OSStatus err = noErr ;
+        if ( !s_wakeupEvent.IsValid() )

         {
         {

-            // is our last wakeup still in the queue
-            if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
-                return ;
-            // has been used already
-            s_wakeupEvent = 0 ;
+           err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+                        kEventAttributeNone ) ;

         }
         }

-        
-        OSStatus err = MacCreateEvent(nil, 'WXMC', 'WXMC', GetCurrentEventTime(),
-                        kEventAttributeNone, &s_wakeupEvent);
-        if (err == noErr) 
+        if ( err == noErr )

         {
         {

+            if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
+                return ;
+            s_wakeupEvent.SetTime(0) ;

             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
                                   kEventPriorityHigh);
             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
                                   kEventPriorityHigh);

-            ReleaseEvent( s_wakeupEvent ) ;
-        } 
+        }

 #else
         PostEvent( nullEvent , 0 ) ;
 #endif
 #else
         PostEvent( nullEvent , 0 ) ;
 #endif


@@ -765,12 +772,12 @@ void wxMacWakeUp()
 
 OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
 {
 
 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)
 {
 }
 
 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 ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -783,45 +790,45 @@ void wxMacControl::Dispose()
     m_controlRef = NULL ;
 }
 
     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
 {
 {
     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
 {
 }
 
 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)
 {
 }
 
 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
 {
 #if TARGET_API_MAC_OSX

-    return SendEventToEventTargetWithOptions( event, 
-        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );        
+    return SendEventToEventTargetWithOptions( event,
+        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );

 #else
 #else

-    #pragma unused(inOptions) 
+    #pragma unused(inOptions)

     return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
 #endif
 }
 
     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) ;
 {
     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) ) ;
 {
     HICommand command ;
     memset( &command, 0 , sizeof(command) ) ;


@@ -829,7 +836,7 @@ OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  )
     return SendHICommand( command , 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 ;
 {
     HiliteControl( m_controlRef , part ) ;
     unsigned long finalTicks ;


@@ -838,86 +845,86 @@ void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
 }
 
 SInt32 wxMacControl::GetValue() const
 }
 
 SInt32 wxMacControl::GetValue() const

-{ 
-    return ::GetControl32BitValue( m_controlRef ) ; 
+{
+    return ::GetControl32BitValue( m_controlRef ) ;

 }
 
 SInt32 wxMacControl::GetMaximum() const
 }
 
 SInt32 wxMacControl::GetMaximum() const

-{ 
-    return ::GetControl32BitMaximum( m_controlRef ) ; 
+{
+    return ::GetControl32BitMaximum( m_controlRef ) ;

 }
 
 SInt32 wxMacControl::GetMinimum() const
 }
 
 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 , 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 ) ;
 }
 
     ::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 ) ;
 }
 
         m_controlRef , focusPart ) ;
 }
 

-bool wxMacControl::HasFocus() const 
+bool wxMacControl::HasFocus() const

 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_controlRef ;
 }
 
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_controlRef ;
 }
 

-bool wxMacControl::NeedsFocusRect() const 
+bool wxMacControl::NeedsFocusRect() const

 {
     return false ;
 }
 
 {
     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 ;
 {
     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 ;
 
     fontStyle.just = teJustLeft ;
     fontStyle.flags |= kControlUseJustMask ;


@@ -926,32 +933,32 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
     else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
         fontStyle.just = teJustRight ;
 
     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
     // 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 ;
     }
     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 ) ;
     // 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 ) ;
 }
 {
     return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
 }


@@ -971,17 +978,17 @@ SInt32 wxMacControl::GetViewSize() const
     return GetControlViewSize( m_controlRef ) ;
 }
 
     return GetControlViewSize( m_controlRef ) ;
 }
 

-bool wxMacControl::IsVisible() const 
+bool wxMacControl::IsVisible() const

 {
     return IsControlVisible( m_controlRef ) ;
 }
 
 {
     return IsControlVisible( m_controlRef ) ;
 }
 

-void wxMacControl::SetVisibility( bool visible , bool redraw ) 
+void wxMacControl::SetVisibility( bool visible , bool redraw )

 {
     SetControlVisibility( m_controlRef , visible , redraw ) ;
 }
 
 {
     SetControlVisibility( m_controlRef , visible , redraw ) ;
 }
 

-bool wxMacControl::IsEnabled() const 
+bool wxMacControl::IsEnabled() const

 {
 #if TARGET_API_MAC_OSX
     return IsControlEnabled( m_controlRef ) ;
 {
 #if TARGET_API_MAC_OSX
     return IsControlEnabled( m_controlRef ) ;


@@ -990,12 +997,12 @@ bool wxMacControl::IsEnabled() const
 #endif
 }
 
 #endif
 }
 

-bool wxMacControl::IsActive() const 
+bool wxMacControl::IsActive() const

 {
     return IsControlActive( m_controlRef ) ;
 }
 
 {
     return IsControlActive( m_controlRef ) ;
 }
 

-void wxMacControl::Enable( bool enable ) 
+void wxMacControl::Enable( bool enable )

 {
 #if TARGET_API_MAC_OSX
     if ( enable )
 {
 #if TARGET_API_MAC_OSX
     if ( enable )


@@ -1010,14 +1017,14 @@ void wxMacControl::Enable( bool enable )
 #endif
 }
 
 #endif
 }
 

-void wxMacControl::SetDrawingEnabled( bool enable ) 
+void wxMacControl::SetDrawingEnabled( bool enable )

 {
 #if TARGET_API_MAC_OSX
     HIViewSetDrawingEnabled( m_controlRef , enable ) ;
 #endif
 }
 
 {
 #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 ) ;
 {
 #if TARGET_API_MAC_OSX
     return HIViewGetNeedsDisplay( m_controlRef ) ;


@@ -1026,7 +1033,7 @@ bool wxMacControl::GetNeedsDisplay() const
 #endif
 }
 
 #endif
 }
 

-void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where ) 
+void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )

 {
 #if TARGET_API_MAC_OSX
     if ( where != NULL )
 {
 #if TARGET_API_MAC_OSX
     if ( where != NULL )


@@ -1036,7 +1043,7 @@ void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where )
 #endif
 }
 
 #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 ;
 {
 #if TARGET_API_MAC_OSX
     HIPoint hiPoint ;


@@ -1048,11 +1055,11 @@ void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to
 #endif
 }
 
 #endif
 }
 

-void wxMacControl::SetRect( Rect *r ) 
+void wxMacControl::SetRect( Rect *r )

 {
 #if TARGET_API_MAC_OSX
 {
 #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
     HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ;
     HIViewSetFrame ( m_controlRef , &hir ) ;
 #else


@@ -1061,23 +1068,23 @@ void wxMacControl::SetRect( Rect *r )
 
 }
 
 
 }
 

-void wxMacControl::GetRect( Rect *r ) 
+void wxMacControl::GetRect( Rect *r )

 {
     GetControlBounds( m_controlRef , r ) ;
 }
 
 {
     GetControlBounds( m_controlRef , r ) ;
 }
 

-void wxMacControl::GetRectInWindowCoords( Rect *r ) 
+void wxMacControl::GetRectInWindowCoords( Rect *r )

 {
     UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
 }
 
 {
     UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
 }
 

-void wxMacControl::GetBestRect( Rect *r ) 
+void wxMacControl::GetBestRect( Rect *r )

 {
     short   baselineoffset ;
     GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
 }
 
 {
     short   baselineoffset ;
     GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
 }
 

-void wxMacControl::SetTitle( const wxString &title ) 
+void wxMacControl::SetTitle( const wxString &title )

 {
     wxFontEncoding encoding;
 
 {
     wxFontEncoding encoding;
 


@@ -1085,7 +1092,7 @@ void wxMacControl::SetTitle( const wxString &title )
         encoding = m_font.GetEncoding();
     else
         encoding = wxFont::GetDefaultEncoding();
         encoding = m_font.GetEncoding();
     else
         encoding = wxFont::GetDefaultEncoding();

-    
+

     UMASetControlTitle(  m_controlRef , title , encoding ) ;
 }
 
     UMASetControlTitle(  m_controlRef , title , encoding ) ;
 }
 


@@ -1094,15 +1101,15 @@ void wxMacControl::GetFeatures( UInt32 * features )
     GetControlFeatures( m_controlRef , 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 ) ;
 }
 
 {
     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
 {
 #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 ;
        (other != NULL) ? other->m_controlRef : NULL) ;
 #else
     return 0 ;


@@ -1116,7 +1123,7 @@ static void InvalidateControlAndChildren( HIViewRef control )
 {
     HIViewSetNeedsDisplay( control , true ) ;
     UInt16 childrenCount = 0 ;
 {
     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") ) ;
     if ( err == errControlIsNotEmbedder )
         return ;
     wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;


@@ -1132,14 +1139,14 @@ static void InvalidateControlAndChildren( HIViewRef control )
 }
 #endif
 
 }
 #endif
 

-void wxMacControl::InvalidateWithChildren() 
+void wxMacControl::InvalidateWithChildren()

 {
 #if TARGET_API_MAC_OSX
     InvalidateControlAndChildren( m_controlRef ) ;
 #endif
 }
 
 {
 #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) ;
 {
 #if TARGET_API_MAC_OSX
     HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;


@@ -1154,13 +1161,13 @@ void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy )
 // Databrowser
 //
 
 // Databrowser
 //
 

-OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options ) 
+OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options )

 {
     return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
 }
 
 OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
 {
     return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
 }
 
 OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,

-        DataBrowserTableViewColumnIndex position ) 
+        DataBrowserTableViewColumnIndex position )

 {
     return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
 }
 {
     return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
 }


@@ -1170,7 +1177,7 @@ OSStatus wxMacControl::AutoSizeListViewColumns()
     return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
 }
 
     return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
 }
 

-OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert ) 
+OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert )

 {
     return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
 }
 {
     return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
 }


@@ -1180,58 +1187,58 @@ OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle
     return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
 }
 
     return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
 }
 

-OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height) 
+OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height)

 {
     return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,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,
 {
     return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
 }
 
 OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,

-        const DataBrowserItemID* items,                
+        const DataBrowserItemID* items,

         DataBrowserPropertyID preSortProperty,
         DataBrowserPropertyID preSortProperty,

-        DataBrowserPropertyID propertyID ) 
+        DataBrowserPropertyID propertyID )

 {
     return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, 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,
 {
     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,
 {
     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,
 {
     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,
 {
     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 ) ;
 }
 
 {
     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 ) ;
 }
 {
     return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
 }


@@ -1239,11 +1246,11 @@ OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowse
 //
 // Tab Control
 //
 //
 // Tab Control
 //

- 
-OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) 
+
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )

 {
     return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
 }
 {
     return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
 }

- 
+

 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI