Warning fix.

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 179bd584e854de77abcbb0a596882bc43d9d41e8..0a18f998c2e030aed2b3b04083cf5a190397dd85 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/mac/carbon/utils.cpp

 // Purpose:     Various utilities
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     Various utilities
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,21 +9,18 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// Note: this is done in utilscmn.cpp now.
-// #pragma implementation "utils.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.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"
+    #include "wx/toplevel.h"

 #else
 #else

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

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


@@ -36,24 +33,28 @@
 #include "MoreFilesX.h"
 
 #ifndef __DARWIN__
 #include "MoreFilesX.h"
 
 #ifndef __DARWIN__

-#include <Threads.h>
-#include <Sound.h>
+    #include <Threads.h>
+    #include <Sound.h>

 #endif
 
 #if wxUSE_GUI
 #if TARGET_API_MAC_OSX
 #endif
 
 #if wxUSE_GUI
 #if TARGET_API_MAC_OSX

-#include <CoreServices/CoreServices.h>
+    #include <CoreServices/CoreServices.h>

 #else
 #else

-#include <DriverServices.h>
-#include <Multiprocessing.h>
+    #include <DriverServices.h>
+    #include <Multiprocessing.h>

 #endif
 
 #endif
 

-#include <ATSUnicode.h>
-#include <TextCommon.h>
-#include <TextEncodingConverter.h>
+#ifdef __DARWIN__
+    #include <Carbon/Carbon.h>
+#else
+    #include <ATSUnicode.h>
+    #include <TextCommon.h>
+    #include <TextEncodingConverter.h>
+#endif

 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI
 

-#include  "wx/mac/private.h"  // includes mac headers
+#include "wx/mac/private.h"

 
 #if defined(__MWERKS__) && wxUSE_UNICODE
     #include <wtime.h>
 
 #if defined(__MWERKS__) && wxUSE_UNICODE
     #include <wtime.h>


@@ -71,12 +72,12 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
     // are there x-platform conventions ?
 
     Gestalt(gestaltSystemVersion, &theSystem) ;
     // are there x-platform conventions ?
 
     Gestalt(gestaltSystemVersion, &theSystem) ;

-    if (minorVsn != NULL) {
-        *minorVsn = (theSystem & 0xFF ) ;
-    }
-    if (majorVsn != NULL) {
-        *majorVsn = (theSystem >> 8 ) ;
-    }
+    if (minorVsn != NULL)
+        *minorVsn = (theSystem & 0xFF) ;
+
+    if (majorVsn != NULL)
+        *majorVsn = (theSystem >> 8) ;
+

 #ifdef __DARWIN__
     return wxMAC_DARWIN;
 #else
 #ifdef __DARWIN__
     return wxMAC_DARWIN;
 #else


@@ -91,7 +92,7 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 // debugging support
 // ----------------------------------------------------------------------------
 
 // debugging support
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+#if defined(__WXDEBUG__) && defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)

 
 // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 
 
 // MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 


@@ -105,11 +106,11 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 
 #if TARGET_API_MAC_CARBON
 
 
 #if TARGET_API_MAC_CARBON
 

-    #include <CodeFragments.h>
+#include <CodeFragments.h>

 
 

-    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);

 
 

-    ProcPtr gCallUniversalProc_Proc = NULL;
+ProcPtr gCallUniversalProc_Proc = NULL;

 
 #endif
 
 
 #endif
 


@@ -117,9 +118,6 @@ static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
 
 static long fRunOnce = false;
 
 
 static long fRunOnce = false;
 

-/* ---------------------------------------------------------------------------
-        IsMetroNubInstalled
-   --------------------------------------------------------------------------- */

 
 Boolean IsMetroNubInstalled()
 {
 
 Boolean IsMetroNubInstalled()
 {


@@ -132,11 +130,10 @@ Boolean IsMetroNubInstalled()
 
         if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
         {
 
         if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
         {

-            /* look for MetroNub's Gestalt selector */
+            // look for MetroNub's Gestalt selector

             if (Gestalt(kMetroNubUserSignature, &result) == noErr)
             {
             if (Gestalt(kMetroNubUserSignature, &result) == noErr)
             {

-
-            #if TARGET_API_MAC_CARBON
+#if TARGET_API_MAC_CARBON

                 if (gCallUniversalProc_Proc == NULL)
                 {
                     CFragConnectionID   connectionID;
                 if (gCallUniversalProc_Proc == NULL)
                 {
                     CFragConnectionID   connectionID;


@@ -165,17 +162,19 @@ Boolean IsMetroNubInstalled()
                         goto end;
                     }
                 }
                         goto end;
                     }
                 }

-            #endif
+#endif

 
                 {
                     MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
 
 
                 {
                     MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
 

-                    /* make sure the version of the API is compatible */
+                    // make sure the version of the API is compatible

                     if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
                         kMetroNubUserAPIVersion <= block->apiHiVersion)
                     if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
                         kMetroNubUserAPIVersion <= block->apiHiVersion)

-                        gMetroNubEntry = block;        /* success! */
+                    {
+                        // success!
+                        gMetroNubEntry = block; 
+                    }

                 }
                 }

-

             }
         }
     }
             }
         }
     }


@@ -189,28 +188,20 @@ end:
 #endif
 }
 
 #endif
 }
 

-/* ---------------------------------------------------------------------------
-        IsMWDebuggerRunning                                            [v1 API]
-   --------------------------------------------------------------------------- */
-

 Boolean IsMWDebuggerRunning()
 {
     if (IsMetroNubInstalled())
         return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
 Boolean IsMWDebuggerRunning()
 {
     if (IsMetroNubInstalled())
         return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);

-    else
-        return false;
-}

 
 

-/* ---------------------------------------------------------------------------
-        AmIBeingMWDebugged                                            [v1 API]
-   --------------------------------------------------------------------------- */
+    return false;
+}

 
 Boolean AmIBeingMWDebugged()
 {
     if (IsMetroNubInstalled())
         return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
 
 Boolean AmIBeingMWDebugged()
 {
     if (IsMetroNubInstalled())
         return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);

-    else
-        return false;
+
+    return false;

 }
 
 extern bool WXDLLEXPORT wxIsDebuggerRunning()
 }
 
 extern bool WXDLLEXPORT wxIsDebuggerRunning()


@@ -237,10 +228,23 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
     return wxGetHostName(buf, maxSize);
 }
 
     return wxGetHostName(buf, maxSize);
 }
 

+// Get user ID e.g. jacs
+bool wxGetUserId(wxChar *buf, int maxSize)
+{
+    return wxGetUserName( buf , maxSize ) ;
+}
+
+const wxChar* wxGetHomeDir(wxString *pstr)
+{
+    *pstr = wxMacFindFolder( (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+    return pstr->c_str() ;
+}
+

 // Get hostname only (without domain name)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
     // Gets Chooser name of user by examining a System resource.
 // Get hostname only (without domain name)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
     // Gets Chooser name of user by examining a System resource.

+    buf[0] = 0 ;

 
     const short kComputerNameID = -16413;
 
 
     const short kComputerNameID = -16413;
 


@@ -257,28 +261,15 @@ bool wxGetHostName(wxChar *buf, int maxSize)
         ReleaseResource( (Handle) chooserName ) ;
         wxStrncpy( buf , name , maxSize - 1 ) ;
     }
         ReleaseResource( (Handle) chooserName ) ;
         wxStrncpy( buf , name , maxSize - 1 ) ;
     }

-    else
-        buf[0] = 0 ;

 
 

-  return TRUE;
-}
-
-// Get user ID e.g. jacs
-bool wxGetUserId(wxChar *buf, int maxSize)
-{
-  return wxGetUserName( buf , maxSize ) ;
-}
-
-const wxChar* wxGetHomeDir(wxString *pstr)
-{
-    *pstr = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
-    return pstr->c_str() ;
+    return true;

 }
 
 // Get user name e.g. Stefan Csomor
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
     // Gets Chooser name of user by examining a System resource.
 }
 
 // Get user name e.g. Stefan Csomor
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
     // Gets Chooser name of user by examining a System resource.

+    buf[0] = 0 ;

 
     const short kChooserNameID = -16096;
 
 
     const short kChooserNameID = -16096;
 


@@ -295,13 +286,11 @@ bool wxGetUserName(wxChar *buf, int maxSize)
         ReleaseResource( (Handle) chooserName ) ;
         wxStrncpy( buf , name , maxSize - 1 ) ;
     }
         ReleaseResource( (Handle) chooserName ) ;
         wxStrncpy( buf , name , maxSize - 1 ) ;
     }

-    else
-        buf[0] = 0 ;

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

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

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


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

-//

 // Execute a program in an Interactive Shell
 // Execute a program in an Interactive Shell

-//

 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)


@@ -379,8 +378,10 @@ void wxBell()
 wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;

+

     info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.name = _T("wxBase");
     info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.name = _T("wxBase");

+

     return info;
 }
 
     return info;
 }
 


@@ -391,13 +392,16 @@ wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;

+

     info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.shortName = _T("mac");
     info.name = _T("wxMac");
     info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
     info.shortName = _T("mac");
     info.name = _T("wxMac");

+

 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");
     info.name << _T("/wxUniversal");
 #endif
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");
     info.name << _T("/wxUniversal");
 #endif

+

     return info;
 }
 
     return info;
 }
 


@@ -406,7 +410,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 +440,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 +451,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;

     }
     }

-    else return FALSE;
+
+    return succ;

 }
 
 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 +464,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;

     }
     }

-    else return FALSE;
+
+    return succ;

 }
 
 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 +477,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;

     }
     }

-    else return FALSE;
+
+    return succ;

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


@@ -507,7 +511,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 +525,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 +543,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 +556,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


@@ -567,7 +571,7 @@ int wxDisplayDepth()
 
     int theDepth = 8;
     theMaxDevice = GetMaxDevice(&globRect);
 
     int theDepth = 8;
     theMaxDevice = GetMaxDevice(&globRect);

-    if (theMaxDevice != nil)
+    if (theMaxDevice != NULL)

         theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
 
     return theDepth ;
         theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
 
     return theDepth ;


@@ -579,12 +583,11 @@ void wxDisplaySize(int *width, int *height)
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
 
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
 

-    if (width != NULL) {
-        *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    }
-    if (height != NULL) {
+    if (width != NULL)
+        *width = screenBits.bounds.right - screenBits.bounds.left ;
+
+    if (height != NULL)

         *height = screenBits.bounds.bottom - screenBits.bounds.top ;
         *height = screenBits.bounds.bottom - screenBits.bounds.top ;

-    }

 }
 
 void wxDisplaySizeMM(int *width, int *height)
 }
 
 void wxDisplaySizeMM(int *width, int *height)


@@ -593,17 +596,17 @@ void wxDisplaySizeMM(int *width, int *height)
     // on mac 72 is fixed (at least now ;-)
     float cvPt2Mm = 25.4 / 72;
 
     // on mac 72 is fixed (at least now ;-)
     float cvPt2Mm = 25.4 / 72;
 

-    if (width != NULL) {
+    if (width != NULL)

         *width = int( *width * cvPt2Mm );
         *width = int( *width * cvPt2Mm );

-    }
-    if (height != NULL) {
+
+    if (height != NULL)

         *height = int( *height * cvPt2Mm );
         *height = int( *height * cvPt2Mm );

-    }

 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     Rect r ;
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     Rect r ;

+

     GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
     if ( x )
         *x = r.left ;
     GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
     if ( x )
         *x = r.left ;


@@ -641,25 +644,23 @@ wxChar *wxGetUserHome (const wxString& user)
     return NULL;
 }
 
     return NULL;
 }
 

-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)

 {
     if ( path.empty() )
 {
     if ( path.empty() )

-        return FALSE;
+        return false;

 
     wxString p = path ;
 
     wxString p = path ;

-    if (p[0u] == ':' ) {
+    if (p[0u] == ':' )

       p = wxGetCwd() + p ;
       p = wxGetCwd() + p ;

-    }

 
     int pos = p.Find(':') ;
 
     int pos = p.Find(':') ;

-    if ( pos != wxNOT_FOUND ) {
+    if ( pos != wxNOT_FOUND )

       p = p.Mid(1,pos) ;
       p = p.Mid(1,pos) ;

-    }

 
     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 +673,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 ) 
-                    *pTotal = wxLongLong( totalBytes ) ;
+                if ( pTotal )
+                    *pTotal = wxDiskspaceSize_t( totalBytes ) ;

                 if ( pFree )
                 if ( pFree )

-                    *pFree = wxLongLong( freeBytes ) ;
+                    *pFree = wxDiskspaceSize_t( freeBytes ) ;

             }
         }
     }
             }
         }
     }

-    
+

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


@@ -704,12 +705,10 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from )
     return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
 }
 
     return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
 }
 

-

 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------
 

-

 extern ProcessSerialNumber gAppProcess ;
 
 void wxMacWakeUp()
 extern ProcessSerialNumber gAppProcess ;
 
 void wxMacWakeUp()


@@ -722,14 +721,32 @@ void wxMacWakeUp()
     if ( isSame )
     {
 #if TARGET_CARBON
     if ( isSame )
     {
 #if TARGET_CARBON

-        EventRef dummyEvent ;
-        OSStatus err = MacCreateEvent(nil, 'WXMC', 'WXMC', GetCurrentEventTime(),
-                        kEventAttributeNone, &dummyEvent);
-        if (err == noErr) 
+        OSStatus err = noErr ;
+
+#if 0
+        // lead sometimes to race conditions, although all calls used should be thread safe ...
+        static wxMacCarbonEvent s_wakeupEvent ;
+        if ( !s_wakeupEvent.IsValid() )
+        {
+           err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+                        kEventAttributeNone ) ;
+        }
+        if ( err == noErr )

         {
         {

-            err = PostEventToQueue(GetMainEventQueue(), dummyEvent,
-                                  kEventPriorityHigh);
-        } 
+            
+            if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
+                return ;
+            s_wakeupEvent.SetCurrentTime() ;
+            err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
+                                  kEventPriorityHigh );
+        }
+#else
+        wxMacCarbonEvent wakeupEvent ;
+        wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+                            kEventAttributeNone ) ;
+        err = PostEventToQueue(GetMainEventQueue(), wakeupEvent,
+                               kEventPriorityHigh );
+#endif

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


@@ -744,167 +761,258 @@ void wxMacWakeUp()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// ----------------------------------------------------------------------------
+// Native Struct Conversions
+// ----------------------------------------------------------------------------
+
+void wxMacRectToNative( const wxRect *wx , Rect *n )
+{
+    n->left = wx->x ;
+    n->top = wx->y ;
+    n->right = wx->x + wx->width ;
+    n->bottom = wx->y + wx->height ;
+}
+
+void wxMacNativeToRect( const Rect *n , wxRect* wx )
+{
+    wx->x = n->left ;
+    wx->y = n->top ;
+    wx->width = n->right - n->left ;
+    wx->height = n->bottom - n->top ;
+}
+
+void wxMacPointToNative( const wxPoint* wx , Point *n )
+{
+    n->h = wx->x ;
+    n->v = wx->y ;
+}
+
+void wxMacNativeToPoint( const Point *n , wxPoint* wx )
+{
+    wx->x = n->h ;
+    wx->y = n->v ;
+}

 
 // ----------------------------------------------------------------------------
 // Carbon Event Support
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Carbon Event Support
 // ----------------------------------------------------------------------------
 

-

 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 ) ;

 }
 
 // ----------------------------------------------------------------------------
 // Control Access Support
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Control Access Support
 // ----------------------------------------------------------------------------
 

+wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
+{
+    Init() ;
+    m_peer = peer ;
+    m_isRootControl = isRootControl ;
+    m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing() ;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , ControlRef control )
+{
+    Init() ;
+    m_peer = peer ;
+    m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing() ;
+    m_controlRef = control ;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , WXWidget control )
+{
+    Init() ;
+    m_peer = peer ;
+    m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing() ;
+    m_controlRef = (ControlRef) control ;
+}
+
+wxMacControl::~wxMacControl()
+{
+}
+
+void wxMacControl::Init()
+{
+    m_peer = NULL ;
+    m_controlRef = NULL ;
+    m_needsFocusRect = false ;
+    m_isCompositing = false ;
+    m_isRootControl = false ;
+}
+

 void wxMacControl::Dispose()
 {
     ::DisposeControl( m_controlRef ) ;
     m_controlRef = NULL ;
 }
 
 void wxMacControl::Dispose()
 {
     ::DisposeControl( m_controlRef ) ;
     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 ) ;
 {
     wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;

+

     event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
     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 ;
 {
     HICommand command ;

+

     memset( &command, 0 , sizeof(command) ) ;
     command.commandID = commandID ;
     return SendHICommand( command , inOptions ) ;
 }
 
     memset( &command, 0 , sizeof(command) ) ;
     command.commandID = commandID ;
     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 ;
     unsigned long finalTicks ;

+
+    HiliteControl( m_controlRef , part ) ;

     Delay( ticks , &finalTicks ) ;
     HiliteControl( m_controlRef , kControlNoPart ) ;
 }
 
 SInt32 wxMacControl::GetValue() const
     Delay( ticks , &finalTicks ) ;
     HiliteControl( m_controlRef , kControlNoPart ) ;
 }
 
 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 )  , 
-        m_controlRef , focusPart ) ;
+    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 ;
 }
 
 {
     ControlRef control ;
     GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
     return control == m_controlRef ;
 }
 

-bool wxMacControl::NeedsFocusRect() const 
+void wxMacControl::SetNeedsFocusRect( bool needs )

 {
 {

-    return false ;
+    m_needsFocusRect = needs ;
+}
+
+bool wxMacControl::NeedsFocusRect() const
+{
+    return m_needsFocusRect ;

 }
 
 }
 

-void wxMacControl::VisibilityChanged(bool shown) 
+void wxMacControl::VisibilityChanged(bool shown)

 {
 }
 
 {
 }
 

-void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) 
+void wxMacControl::SuperChangedPosition()
+{
+}
+
+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 ;


@@ -913,32 +1021,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 )
     {
     if ( foreground != *wxBLACK )
     {

-        fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
+        fontStyle.foreColor = MAC_WXCOLORREF( foreground.GetPixel() ) ;

         fontStyle.flags |= kControlUseForeColorMask ;
     }
         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 ) ;
 }


@@ -958,17 +1066,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 ) ;


@@ -977,12 +1085,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 )


@@ -997,74 +1105,208 @@ 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 
+#if TARGET_API_MAC_OSX
+bool wxMacControl::GetNeedsDisplay() const

 {
 #if TARGET_API_MAC_OSX
 {
 #if TARGET_API_MAC_OSX

-    return HIViewGetNeedsDisplay( m_controlRef ) ;
-#else
-    return false ;
+    if ( m_isCompositing )
+    {
+        return HIViewGetNeedsDisplay( m_controlRef ) ;
+    }
+    else

 #endif
 #endif

+    {
+        if ( !IsVisible() )
+            return false ;
+
+        Rect controlBounds ;
+        GetControlBounds( m_controlRef, &controlBounds ) ;
+        RgnHandle rgn = NewRgn() ;
+        GetWindowRegion ( GetControlOwner( m_controlRef ) , kWindowUpdateRgn , rgn ) ;
+        Boolean intersect = RectInRgn ( &controlBounds , rgn ) ;
+        DisposeRgn( rgn ) ;
+
+        return intersect ;
+    }

 }
 }

+#endif

 
 

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

 {
 {

+    if ( !IsVisible() )
+        return ;
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-    if ( where != NULL )
-        HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;
+    if ( m_isCompositing )
+    {
+        HIViewSetNeedsDisplayInRegion( m_controlRef , where , true ) ;
+    }

     else
     else

-        HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;

 #endif
 #endif

+    {
+        Rect controlBounds ;
+        GetControlBounds( m_controlRef, &controlBounds ) ;
+        RgnHandle update = NewRgn() ;
+        CopyRgn( where , update ) ;
+        OffsetRgn( update , controlBounds.left , controlBounds.top ) ;
+        InvalWindowRgn( GetControlOwner( m_controlRef) , update ) ;
+    }

 }
 
 }
 

-void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) 
+void wxMacControl::SetNeedsDisplay( Rect* where )

 {
 {

+    if ( !IsVisible() )
+        return ;
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-    HIPoint hiPoint ;
-    hiPoint.x = pt->x ;
-    hiPoint.y = pt->y ;
-    HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef  ) ;
-    pt->x = (int)hiPoint.x ;
-    pt->y = (int)hiPoint.y ;
+    if ( m_isCompositing )
+    {
+        if ( where != NULL )
+        {
+            RgnHandle update = NewRgn() ;
+            RectRgn( update , where ) ;
+            HIViewSetNeedsDisplayInRegion( m_controlRef , update , true ) ;
+            DisposeRgn( update ) ;
+        }
+        else
+            HIViewSetNeedsDisplay( m_controlRef , true ) ;
+    }
+    else

 #endif
 #endif

+    {
+        Rect controlBounds ;
+
+        GetControlBounds( m_controlRef, &controlBounds ) ;
+        if ( where )
+        {
+            Rect whereLocal = *where ;
+            OffsetRect( &whereLocal , controlBounds.left , controlBounds.top ) ;
+            SectRect( &controlBounds , &whereLocal, &controlBounds ) ;
+        }
+
+        InvalWindowRect( GetControlOwner( m_controlRef) , &controlBounds ) ;
+    }

 }
 
 }
 

-void wxMacControl::SetRect( Rect *r ) 
+void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )

 {
 #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
-    HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ;
-    HIViewSetFrame ( m_controlRef , &hir ) ;
-#else
-    SetControlBounds( m_controlRef , r ) ;
+    if ( from->m_peer->MacGetTopLevelWindow()->MacUsesCompositing() )
+    {
+        HIPoint hiPoint ;
+
+        hiPoint.x = pt->x ;
+        hiPoint.y = pt->y ;
+        HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef  ) ;
+        pt->x = (int)hiPoint.x ;
+        pt->y = (int)hiPoint.y ;
+    }
+    else
+#endif
+    {
+        Rect fromRect, toRect ;
+
+        GetControlBounds( from->m_controlRef , &fromRect ) ;
+        GetControlBounds( to->m_controlRef , &toRect ) ;
+        if ( from->m_isRootControl )
+            fromRect.left = fromRect.top = 0 ;
+        if ( to->m_isRootControl )
+            toRect.left = toRect.top = 0 ;
+
+        pt->x = pt->x + fromRect.left - toRect.left ;
+        pt->y = pt->y + fromRect.top - toRect.top ;
+    }
+}
+
+void wxMacControl::SetRect( Rect *r )
+{
+#if TARGET_API_MAC_OSX
+    if ( m_isCompositing )
+    {
+        //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 ) ;
+        // eventuall we might have to do a SetVisibility( false , true ) ;
+        // before and a SetVisibility( true , true ) ; after
+    }
+    else

 #endif
 #endif

+    {
+        bool vis = IsVisible() ;
+        if ( vis )
+        {
+            Rect former ;
+            GetControlBounds( m_controlRef , &former ) ;
+            InvalWindowRect( GetControlOwner( m_controlRef ) , &former ) ;
+        }
+
+        Rect controlBounds = *r ;
+
+        // since the rect passed in is always (even in non-compositing) relative
+        // to the (native) parent, we have to adjust to window relative here
+        wxMacControl* parent = m_peer->GetParent()->GetPeer() ;
+        if ( !parent->m_isRootControl )
+        {
+            Rect superRect ;
+            GetControlBounds( parent->m_controlRef , &superRect ) ;
+            OffsetRect( &controlBounds , superRect.left , superRect.top ) ;
+        }

 
 

+        SetControlBounds( m_controlRef , &controlBounds ) ;
+        if ( vis )
+            InvalWindowRect( GetControlOwner( m_controlRef ) , &controlBounds ) ;
+    }

 }
 
 }
 

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

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

+    if ( !m_isCompositing )
+    {
+        // correct the case of the root control
+        if ( m_isRootControl )
+        {
+            WindowRef wr = GetControlOwner( m_controlRef ) ;
+            GetWindowBounds( wr , kWindowContentRgn , r ) ;
+            r->right -= r->left ;
+            r->bottom -= r->top ;
+            r->left = 0 ;
+            r->top = 0 ;
+        }
+        else
+        {
+            wxMacControl* parent = m_peer->GetParent()->GetPeer() ;
+            if ( !parent->m_isRootControl )
+            {
+                Rect superRect ;
+                GetControlBounds( parent->m_controlRef , &superRect ) ;
+                OffsetRect( r , -superRect.left , -superRect.top ) ;
+            }
+        }
+    }

 }
 
 }
 

-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 ;
 {
     short   baselineoffset ;

+

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

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

 {
     wxFontEncoding encoding;
 
 {
     wxFontEncoding encoding;
 


@@ -1072,8 +1314,8 @@ 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 ) ;

 }
 
 void wxMacControl::GetFeatures( UInt32 * features )
 }
 
 void wxMacControl::GetFeatures( UInt32 * features )


@@ -1081,73 +1323,107 @@ 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 ) ;
+    OSStatus err = GetControlRegion( m_controlRef , partCode , region ) ;
+    if ( !m_isCompositing )
+    {
+        if ( !m_isRootControl )
+        {
+            Rect r ;
+
+            GetControlBounds(m_controlRef, &r ) ;
+            if ( !EmptyRgn( region ) )
+                OffsetRgn( region , -r.left , -r.top ) ;
+        }
+    }
+
+    return err ;

 }
 
 }
 

-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 ;
 #endif
 }
 
        (other != NULL) ? other->m_controlRef : NULL) ;
 #else
     return 0 ;
 #endif
 }
 

-

 #if TARGET_API_MAC_OSX
 // SetNeedsDisplay would not invalidate the children
 static void InvalidateControlAndChildren( HIViewRef control )
 {
     HIViewSetNeedsDisplay( control , true ) ;
     UInt16 childrenCount = 0 ;
 #if TARGET_API_MAC_OSX
 // SetNeedsDisplay would not invalidate the children
 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 ;
     if ( err == errControlIsNotEmbedder )
         return ;

+

     wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
 
     wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
 

-    for ( UInt16 i = childrenCount ; i >=1  ; --i )
+    for ( UInt16 i = childrenCount ; i >=1 ; --i )

     {
         HIViewRef child ;
     {
         HIViewRef child ;

+

         err = GetIndexedSubControl( control , i , & child ) ;
         if ( err == errControlIsNotEmbedder )
             return ;
         err = GetIndexedSubControl( control , i , & child ) ;
         if ( err == errControlIsNotEmbedder )
             return ;

+

         InvalidateControlAndChildren( child ) ;
     }
 }
 #endif
 
         InvalidateControlAndChildren( child ) ;
     }
 }
 #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( wxRect *r , int dx , int dy )

 {
 {

+    wxASSERT( r != NULL ) ;
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-    HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
-    HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
+    if ( m_isCompositing )
+    {
+        HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height) ;
+        HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
+    }
+    else

 #endif
 #endif

+    {
+        Rect bounds ;
+
+        GetControlBounds( m_controlRef , &bounds ) ;
+        bounds.left += r->x ;
+        bounds.top += r->y ;
+        bounds.bottom = bounds.top + r->height ;
+        bounds.right = bounds.left + r->width ;
+        wxMacWindowClipper clip( m_peer ) ;
+        RgnHandle updateRgn = NewRgn() ;
+        ::ScrollRect( &bounds , dx , dy , updateRgn ) ;
+        InvalWindowRgn( GetControlOwner( m_controlRef ) , updateRgn ) ;
+        DisposeRgn( updateRgn );
+    }

 }
 
 }
 

-

 // SetNeedsDisplay would not invalidate the children
 
 //
 // Databrowser
 //
 
 // SetNeedsDisplay would not invalidate the children
 
 //
 // 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 ) ;
 }


@@ -1157,7 +1433,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 ) ;
 }


@@ -1167,65 +1443,145 @@ 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 )
+{
+    return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
+}
+

 //
 // 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

 
 

+//
+// Quartz Support
+//
+
+#ifdef __WXMAC_OSX__
+// snippets from Sketch Sample from Apple :
+
+#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc"
+
+/*
+    This function locates, opens, and returns the profile reference for the calibrated
+    Generic RGB color space. It is up to the caller to call CMCloseProfile when done
+    with the profile reference this function returns.
+*/
+CMProfileRef wxMacOpenGenericProfile()
+{
+    static CMProfileRef cachedRGBProfileRef = NULL;
+
+    // we only create the profile reference once
+    if (cachedRGBProfileRef == NULL)
+    {
+        CMProfileLocation loc;
+
+        loc.locType = cmPathBasedProfile;
+        strcpy(loc.u.pathLoc.path, kGenericRGBProfilePathStr);
+
+        verify_noerr( CMOpenProfile(&cachedRGBProfileRef, &loc) );
+    }
+
+    // clone the profile reference so that the caller has their own reference, not our cached one
+    if (cachedRGBProfileRef)
+        CMCloneProfileRef(cachedRGBProfileRef);
+
+    return cachedRGBProfileRef;
+}
+
+/*
+    Return the generic RGB color space. This is a 'get' function and the caller should
+    not release the returned value unless the caller retains it first. Usually callers
+    of this routine will immediately use the returned colorspace with CoreGraphics
+    so they typically do not need to retain it themselves.
+
+    This function creates the generic RGB color space once and hangs onto it so it can
+    return it whenever this function is called.
+*/
+
+CGColorSpaceRef wxMacGetGenericRGBColorSpace()
+{
+    static wxMacCFRefHolder<CGColorSpaceRef> genericRGBColorSpace ;
+
+    if (genericRGBColorSpace == NULL)
+    {
+        if ( UMAGetSystemVersion() >= 0x1040 )
+        {
+            genericRGBColorSpace.Set( CGColorSpaceCreateWithName( CFSTR("kCGColorSpaceGenericRGB") ) ) ;
+        }
+        else
+        {
+            CMProfileRef genericRGBProfile = wxMacOpenGenericProfile();
+
+            if (genericRGBProfile)
+            {
+                genericRGBColorSpace.Set( CGColorSpaceCreateWithPlatformColorSpace(genericRGBProfile) ) ;
+
+                wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") ) ;
+
+                // we opened the profile so it is up to us to close it
+                CMCloseProfile(genericRGBProfile); 
+            }
+        }
+    }
+
+    return genericRGBColorSpace;
+}
+#endif
+
+#endif // wxUSE_GUI