Made all of the GNOME print support based

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 258c28bcf165485406d4a11be3b8c2359a4aecbf..be604f9e30debdf9c1e81e07c7008cc3800d1d87 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -33,21 +33,25 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#ifdef __DARWIN__
-#  include "MoreFilesX.h"
-#else
-#  include "MoreFiles.h"
-#  include "MoreFilesExtras.h"
-#endif
+#include "MoreFilesX.h"

 
 #ifndef __DARWIN__
 #include <Threads.h>
 #include <Sound.h>
 #endif
 
 
 #ifndef __DARWIN__
 #include <Threads.h>
 #include <Sound.h>
 #endif
 

+#if wxUSE_GUI
+#if TARGET_API_MAC_OSX
+#include <CoreServices/CoreServices.h>
+#else
+#include <DriverServices.h>
+#include <Multiprocessing.h>
+#endif
+

 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>
 #include <ATSUnicode.h>
 #include <TextCommon.h>
 #include <TextEncodingConverter.h>

+#endif // wxUSE_GUI

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


@@ -80,8 +84,150 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
 #endif
 }
 

+

 #if wxUSE_BASE
 
 #if wxUSE_BASE
 

+// ----------------------------------------------------------------------------
+// debugging support
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
+
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+    #include <CodeFragments.h>
+
+    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+    ProcPtr gCallUniversalProc_Proc = NULL;
+
+#endif
+
+static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+/* ---------------------------------------------------------------------------
+        IsMetroNubInstalled
+   --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()
+{
+    if (!fRunOnce)
+    {
+        long result, value;
+
+        fRunOnce = true;
+        gMetroNubEntry = NULL;
+
+        if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+        {
+            /* look for MetroNub's Gestalt selector */
+            if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+            {
+
+            #if TARGET_API_MAC_CARBON
+                if (gCallUniversalProc_Proc == NULL)
+                {
+                    CFragConnectionID   connectionID;
+                    Ptr                 mainAddress;
+                    Str255              errorString;
+                    ProcPtr             symbolAddress;
+                    OSErr               err;
+                    CFragSymbolClass    symbolClass;
+
+                    symbolAddress = NULL;
+                    err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+                                           &connectionID, &mainAddress, errorString);
+
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;
+                    }
+
+                    err = FindSymbol(connectionID, "\pCallUniversalProc",
+                                    (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;
+                    }
+                }
+            #endif
+
+                {
+                    MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+
+                    /* make sure the version of the API is compatible */
+                    if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+                        kMetroNubUserAPIVersion <= block->apiHiVersion)
+                        gMetroNubEntry = block;        /* success! */
+                }
+
+            }
+        }
+    }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+    return (gMetroNubEntry != NULL);
+#endif
+}
+
+/* ---------------------------------------------------------------------------
+        IsMWDebuggerRunning                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()
+{
+    if (IsMetroNubInstalled())
+        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+    else
+        return false;
+}
+
+/* ---------------------------------------------------------------------------
+        AmIBeingMWDebugged                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean AmIBeingMWDebugged()
+{
+    if (IsMetroNubInstalled())
+        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+    else
+        return false;
+}
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return IsMWDebuggerRunning() && AmIBeingMWDebugged();
+}
+
+#else
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return false;
+}
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+
+

 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 


@@ -196,24 +342,27 @@ long wxGetFreeMemory()
     return FreeMem() ;
 }
 
     return FreeMem() ;
 }
 

-void wxUsleep(unsigned long milliseconds)
+#ifndef __DARWIN__
+
+void wxMicroSleep(unsigned long microseconds)
+{
+       AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
+       MPDelayUntil( & wakeup);
+}
+
+void wxMilliSleep(unsigned long milliseconds)

 {
 {

-    // TODO remove if we don't encounter any other problemsy
-    /*
-    clock_t start = clock() ;
-    do
-    {
-        YieldToAnyThread() ;
-    } while( clock() - start < milliseconds /  1000.0 * CLOCKS_PER_SEC ) ;
-    */
-    wxThread::Sleep( milliseconds ) ;
+       AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime());
+       MPDelayUntil( & wakeup);

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

-    wxUsleep(1000*nSecs);
+    wxMilliSleep(1000*nSecs);

 }
 
 }
 

+#endif
+

 // Consume all events until no more left
 void wxFlushEvents()
 {
 // Consume all events until no more left
 void wxFlushEvents()
 {


@@ -372,18 +521,12 @@ wxString wxMacFindFolder( short        vol,
               OSType       folderType,
               Boolean      createFolder)
 {
               OSType       folderType,
               Boolean      createFolder)
 {

-    short    vRefNum  ;
-    long     dirID ;
+    FSRef fsRef ;    

     wxString strDir ;
 
     wxString strDir ;
 

-    if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
-    {
-        FSSpec file ;
-        if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
-        {
-            strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
-        }
-    }
+    if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
+        strDir = wxMacFSRefToPath( &fsRef ) + wxFILE_SEP_PATH ;
+

     return strDir ;
 }
 
     return strDir ;
 }
 


@@ -515,20 +658,28 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     p = p + wxT(":") ;
 
 
     p = p + wxT(":") ;
 

-    Str255 volumeName ;
-    XVolumeParam pb ;
-
-    wxMacStringToPascal( p  , volumeName ) ;
-    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
-    if ( err == noErr ) {
-      if ( pTotal ) {
-        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
-      }
-      if ( pFree ) {
-        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
-      }
+    OSErr err = noErr ;
+    
+    FSRef fsRef ;
+    err = wxMacPathToFSRef( p , &fsRef ) ;
+    if ( noErr == err )
+    {
+        FSVolumeRefNum vRefNum ;
+        err = FSGetVRefNum( &fsRef , &vRefNum ) ;
+        if ( noErr == err )
+        {
+            UInt64 freeBytes , totalBytes ;
+            err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ;
+            if ( noErr == err )
+            {
+                if ( pTotal ) 
+                    *pTotal = wxLongLong( totalBytes ) ;
+                if ( pFree )
+                    *pFree = wxLongLong( freeBytes ) ;
+            }
+        }

     }
     }

-
+    

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


@@ -554,687 +705,10 @@ wxString wxMacMakeStringFromPascal( ConstStringPtr from )
 }
 
 
 }
 
 

-wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
-{      
-       TextEncodingBase enc = 0 ;
-       if ( encoding == wxFONTENCODING_DEFAULT )
-       {
-#if wxUSE_GUI
-               encoding = wxFont::GetDefaultEncoding() ;
-#else
-               encoding = wxLocale::GetSystemEncoding() ;
-#endif
-       }
-
-       switch( encoding)
-       {
-               case wxFONTENCODING_ISO8859_1 :
-               enc = kTextEncodingISOLatin1 ;
-               break ;
-               case wxFONTENCODING_ISO8859_2 :
-               enc = kTextEncodingISOLatin2;
-               break ;
-               case wxFONTENCODING_ISO8859_3 :
-               enc = kTextEncodingISOLatin3 ;
-               break ;
-               case wxFONTENCODING_ISO8859_4 :
-               enc = kTextEncodingISOLatin4;
-               break ;
-               case wxFONTENCODING_ISO8859_5 :
-               enc = kTextEncodingISOLatinCyrillic;
-               break ;
-               case wxFONTENCODING_ISO8859_6 :
-               enc = kTextEncodingISOLatinArabic;
-               break ;
-               case wxFONTENCODING_ISO8859_7 :
-               enc = kTextEncodingISOLatinGreek;
-               break ;
-               case wxFONTENCODING_ISO8859_8 :
-               enc = kTextEncodingISOLatinHebrew;
-               break ;
-               case wxFONTENCODING_ISO8859_9 :
-               enc = kTextEncodingISOLatin5;
-               break ;
-               case wxFONTENCODING_ISO8859_10 :
-               enc = kTextEncodingISOLatin6;
-               break ;
-               case wxFONTENCODING_ISO8859_13 :
-               enc = kTextEncodingISOLatin7;
-               break ;
-               case wxFONTENCODING_ISO8859_14 :
-               enc = kTextEncodingISOLatin8;
-               break ;
-               case wxFONTENCODING_ISO8859_15 :
-               enc = kTextEncodingISOLatin9;
-               break ;
-
-               case wxFONTENCODING_KOI8 :
-               enc = kTextEncodingKOI8_R;
-               break ;
-               case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
-               enc = kTextEncodingDOSRussian;
-               break ;
-/*
-               case wxFONTENCODING_BULGARIAN : 
-               enc = ;
-               break ;
-*/                     
-               case wxFONTENCODING_CP437 : 
-               enc =kTextEncodingDOSLatinUS ;
-               break ;
-               case wxFONTENCODING_CP850 :
-               enc = kTextEncodingDOSLatin1;
-               break ;
-               case wxFONTENCODING_CP852 : 
-               enc = kTextEncodingDOSLatin2;
-               break ;
-               case wxFONTENCODING_CP855 :
-               enc = kTextEncodingDOSCyrillic;
-               break ;
-               case wxFONTENCODING_CP866 :
-               enc =kTextEncodingDOSRussian ;
-               break ;
-               case wxFONTENCODING_CP874 :
-               enc = kTextEncodingDOSThai;
-               break ;
-               case wxFONTENCODING_CP932 : 
-               enc = kTextEncodingDOSJapanese;
-               break ;
-               case wxFONTENCODING_CP936 : 
-               enc =kTextEncodingDOSChineseSimplif ;
-               break ;
-               case wxFONTENCODING_CP949 : 
-               enc = kTextEncodingDOSKorean;
-               break ;
-               case wxFONTENCODING_CP950 : 
-               enc = kTextEncodingDOSChineseTrad;
-               break ;
-               
-               case wxFONTENCODING_CP1250 : 
-               enc = kTextEncodingWindowsLatin2;
-               break ;
-               case wxFONTENCODING_CP1251 : 
-               enc =kTextEncodingWindowsCyrillic ;
-               break ;
-               case wxFONTENCODING_CP1252 : 
-               enc =kTextEncodingWindowsLatin1 ;
-               break ;
-               case wxFONTENCODING_CP1253 : 
-               enc = kTextEncodingWindowsGreek;
-               break ;
-               case wxFONTENCODING_CP1254 : 
-               enc = kTextEncodingWindowsLatin5;
-               break ;
-               case wxFONTENCODING_CP1255 : 
-               enc =kTextEncodingWindowsHebrew ;
-               break ;
-               case wxFONTENCODING_CP1256 : 
-               enc =kTextEncodingWindowsArabic ;
-               break ;
-               case wxFONTENCODING_CP1257 : 
-               enc = kTextEncodingWindowsBalticRim;
-               break ;
-               
-               case wxFONTENCODING_UTF7 : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
-               break ;
-               case wxFONTENCODING_UTF8 : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
-               break ;
-               case wxFONTENCODING_EUC_JP : 
-               enc = kTextEncodingEUC_JP;
-               break ;
-               case wxFONTENCODING_UTF16BE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF16LE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF32BE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF32LE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
-               break ;
-
-        case wxFONTENCODING_MACROMAN :
-            enc = kTextEncodingMacRoman ;
-            break ;
-        case wxFONTENCODING_MACJAPANESE :
-            enc = kTextEncodingMacJapanese ;
-            break ;
-        case wxFONTENCODING_MACCHINESETRAD :
-            enc = kTextEncodingMacChineseTrad ;
-            break ;
-        case wxFONTENCODING_MACKOREAN :
-            enc = kTextEncodingMacKorean ;
-            break ;
-        case wxFONTENCODING_MACARABIC :
-            enc = kTextEncodingMacArabic ;
-            break ;
-        case wxFONTENCODING_MACHEBREW :
-            enc = kTextEncodingMacHebrew ;
-            break ;
-        case wxFONTENCODING_MACGREEK :
-            enc = kTextEncodingMacGreek ;
-            break ;
-        case wxFONTENCODING_MACCYRILLIC :
-            enc = kTextEncodingMacCyrillic ;
-            break ;
-        case wxFONTENCODING_MACDEVANAGARI :
-            enc = kTextEncodingMacDevanagari ;
-            break ;
-        case wxFONTENCODING_MACGURMUKHI :
-            enc = kTextEncodingMacGurmukhi ;
-            break ;
-        case wxFONTENCODING_MACGUJARATI :
-            enc = kTextEncodingMacGujarati ;
-            break ;
-        case wxFONTENCODING_MACORIYA :
-            enc = kTextEncodingMacOriya ;
-            break ;
-        case wxFONTENCODING_MACBENGALI :
-            enc = kTextEncodingMacBengali ;
-            break ;
-        case wxFONTENCODING_MACTAMIL :
-            enc = kTextEncodingMacTamil ;
-            break ;
-        case wxFONTENCODING_MACTELUGU :
-            enc = kTextEncodingMacTelugu ;
-            break ;
-        case wxFONTENCODING_MACKANNADA :
-            enc = kTextEncodingMacKannada ;
-            break ;
-        case wxFONTENCODING_MACMALAJALAM :
-            enc = kTextEncodingMacMalayalam ;
-            break ;
-        case wxFONTENCODING_MACSINHALESE :
-            enc = kTextEncodingMacSinhalese ;
-            break ;
-        case wxFONTENCODING_MACBURMESE :
-            enc = kTextEncodingMacBurmese ;
-            break ;
-        case wxFONTENCODING_MACKHMER :
-            enc = kTextEncodingMacKhmer ;
-            break ;
-        case wxFONTENCODING_MACTHAI :
-            enc = kTextEncodingMacThai ;
-            break ;
-        case wxFONTENCODING_MACLAOTIAN :
-            enc = kTextEncodingMacLaotian ;
-            break ;
-        case wxFONTENCODING_MACGEORGIAN :
-            enc = kTextEncodingMacGeorgian ;
-            break ;
-        case wxFONTENCODING_MACARMENIAN :
-            enc = kTextEncodingMacArmenian ;
-            break ;
-        case wxFONTENCODING_MACCHINESESIMP :
-            enc = kTextEncodingMacChineseSimp ;
-            break ;
-        case wxFONTENCODING_MACTIBETAN :
-            enc = kTextEncodingMacTibetan ;
-            break ;
-        case wxFONTENCODING_MACMONGOLIAN :
-            enc = kTextEncodingMacMongolian ;
-            break ;
-        case wxFONTENCODING_MACETHIOPIC :
-            enc = kTextEncodingMacEthiopic ;
-            break ;
-        case wxFONTENCODING_MACCENTRALEUR :
-            enc = kTextEncodingMacCentralEurRoman ;
-            break ;
-        case wxFONTENCODING_MACVIATNAMESE :
-            enc = kTextEncodingMacVietnamese ;
-            break ;
-        case wxFONTENCODING_MACARABICEXT :
-            enc = kTextEncodingMacExtArabic ;
-            break ;
-        case wxFONTENCODING_MACSYMBOL :
-            enc = kTextEncodingMacSymbol ;
-            break ;
-        case wxFONTENCODING_MACDINGBATS :
-            enc = kTextEncodingMacDingbats ;
-            break ;
-        case wxFONTENCODING_MACTURKISH :
-            enc = kTextEncodingMacTurkish ;
-            break ;
-        case wxFONTENCODING_MACCROATIAN :
-            enc = kTextEncodingMacCroatian ;
-            break ;
-        case wxFONTENCODING_MACICELANDIC :
-            enc = kTextEncodingMacIcelandic ;
-            break ;
-        case wxFONTENCODING_MACROMANIAN :
-            enc = kTextEncodingMacRomanian ;
-            break ;
-        case wxFONTENCODING_MACCELTIC :
-            enc = kTextEncodingMacCeltic ;
-            break ;
-        case wxFONTENCODING_MACGAELIC :
-            enc = kTextEncodingMacGaelic ;
-            break ;
-        case wxFONTENCODING_MACKEYBOARD :
-            enc = kTextEncodingMacKeyboardGlyphs ;
-            break ;    
-               default :
-                       // to make gcc happy
-                       break ;
-       } ;
-       return enc ;
-}
-
-wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
-{      
-       wxFontEncoding enc = wxFONTENCODING_DEFAULT ;
-
-       switch( encoding)
-       {
-               case kTextEncodingISOLatin1  :
-               enc = wxFONTENCODING_ISO8859_1 ;
-               break ;
-               case kTextEncodingISOLatin2 :
-               enc = wxFONTENCODING_ISO8859_2;
-               break ;
-               case kTextEncodingISOLatin3 :
-               enc = wxFONTENCODING_ISO8859_3 ;
-               break ;
-               case kTextEncodingISOLatin4 :
-               enc = wxFONTENCODING_ISO8859_4;
-               break ;
-               case kTextEncodingISOLatinCyrillic :
-               enc = wxFONTENCODING_ISO8859_5;
-               break ;
-               case kTextEncodingISOLatinArabic :
-               enc = wxFONTENCODING_ISO8859_6;
-               break ;
-               case kTextEncodingISOLatinGreek :
-               enc = wxFONTENCODING_ISO8859_7;
-               break ;
-               case kTextEncodingISOLatinHebrew :
-               enc = wxFONTENCODING_ISO8859_8;
-               break ;
-               case kTextEncodingISOLatin5 :
-               enc = wxFONTENCODING_ISO8859_9;
-               break ;
-               case kTextEncodingISOLatin6 :
-               enc = wxFONTENCODING_ISO8859_10;
-               break ;
-               case kTextEncodingISOLatin7 :
-               enc = wxFONTENCODING_ISO8859_13;
-               break ;
-               case kTextEncodingISOLatin8 :
-               enc = wxFONTENCODING_ISO8859_14;
-               break ;
-               case kTextEncodingISOLatin9 :
-               enc =wxFONTENCODING_ISO8859_15 ;
-               break ;
-
-               case kTextEncodingKOI8_R :
-               enc = wxFONTENCODING_KOI8;
-               break ;
-/*
-               case  : 
-               enc = wxFONTENCODING_BULGARIAN;
-               break ;
-*/                     
-               case kTextEncodingDOSLatinUS : 
-               enc = wxFONTENCODING_CP437;
-               break ;
-               case kTextEncodingDOSLatin1 :
-               enc = wxFONTENCODING_CP850;
-               break ;
-               case kTextEncodingDOSLatin2 : 
-               enc =wxFONTENCODING_CP852 ;
-               break ;
-               case kTextEncodingDOSCyrillic :
-               enc = wxFONTENCODING_CP855;
-               break ;
-               case kTextEncodingDOSRussian :
-               enc = wxFONTENCODING_CP866;
-               break ;
-               case kTextEncodingDOSThai :
-               enc =wxFONTENCODING_CP874 ;
-               break ;
-               case kTextEncodingDOSJapanese : 
-               enc = wxFONTENCODING_CP932;
-               break ;
-               case kTextEncodingDOSChineseSimplif : 
-               enc = wxFONTENCODING_CP936;
-               break ;
-               case kTextEncodingDOSKorean : 
-               enc = wxFONTENCODING_CP949;
-               break ;
-               case kTextEncodingDOSChineseTrad : 
-               enc = wxFONTENCODING_CP950;
-               break ;
-               
-               case kTextEncodingWindowsLatin2 : 
-               enc = wxFONTENCODING_CP1250;
-               break ;
-               case kTextEncodingWindowsCyrillic : 
-               enc = wxFONTENCODING_CP1251;
-               break ;
-               case kTextEncodingWindowsLatin1 : 
-               enc = wxFONTENCODING_CP1252;
-               break ;
-               case kTextEncodingWindowsGreek : 
-               enc = wxFONTENCODING_CP1253;
-               break ;
-               case kTextEncodingWindowsLatin5 : 
-               enc = wxFONTENCODING_CP1254;
-               break ;
-               case kTextEncodingWindowsHebrew : 
-               enc = wxFONTENCODING_CP1255;
-               break ;
-               case kTextEncodingWindowsArabic : 
-               enc = wxFONTENCODING_CP1256;
-               break ;
-               case kTextEncodingWindowsBalticRim : 
-               enc =wxFONTENCODING_CP1257 ;
-               break ;
-               case kTextEncodingEUC_JP : 
-               enc = wxFONTENCODING_EUC_JP;
-               break ;
-               /*
-               case wxFONTENCODING_UTF7 : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
-               break ;
-               case wxFONTENCODING_UTF8 : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicodeUTF8Format) ;
-               break ;
-               case wxFONTENCODING_UTF16BE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF16LE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF32BE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
-               break ;
-               case wxFONTENCODING_UTF32LE : 
-               enc = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode32BitFormat) ;
-               break ;
-        */
-        case kTextEncodingMacRoman :
-            enc = wxFONTENCODING_MACROMAN ;
-            break ;
-        case kTextEncodingMacJapanese :
-            enc = wxFONTENCODING_MACJAPANESE ;
-            break ;
-        case kTextEncodingMacChineseTrad :
-            enc = wxFONTENCODING_MACCHINESETRAD ;
-            break ;
-        case kTextEncodingMacKorean :
-            enc = wxFONTENCODING_MACKOREAN ;
-            break ;
-        case kTextEncodingMacArabic :
-            enc =wxFONTENCODING_MACARABIC ;
-            break ;
-        case kTextEncodingMacHebrew :
-            enc = wxFONTENCODING_MACHEBREW ;
-            break ;
-        case kTextEncodingMacGreek :
-            enc = wxFONTENCODING_MACGREEK ;
-            break ;
-        case kTextEncodingMacCyrillic :
-            enc = wxFONTENCODING_MACCYRILLIC ;
-            break ;
-        case kTextEncodingMacDevanagari :
-            enc = wxFONTENCODING_MACDEVANAGARI ;
-            break ;
-        case kTextEncodingMacGurmukhi :
-            enc = wxFONTENCODING_MACGURMUKHI ;
-            break ;
-        case kTextEncodingMacGujarati :
-            enc = wxFONTENCODING_MACGUJARATI ;
-            break ;
-        case kTextEncodingMacOriya :
-            enc =wxFONTENCODING_MACORIYA ;
-            break ;
-        case kTextEncodingMacBengali :
-            enc =wxFONTENCODING_MACBENGALI ;
-            break ;
-        case kTextEncodingMacTamil :
-            enc = wxFONTENCODING_MACTAMIL ;
-            break ;
-        case kTextEncodingMacTelugu :
-            enc = wxFONTENCODING_MACTELUGU ;
-            break ;
-        case kTextEncodingMacKannada :
-            enc = wxFONTENCODING_MACKANNADA ;
-            break ;
-        case kTextEncodingMacMalayalam :
-            enc = wxFONTENCODING_MACMALAJALAM ;
-            break ;
-        case kTextEncodingMacSinhalese :
-            enc = wxFONTENCODING_MACSINHALESE ;
-            break ;
-        case kTextEncodingMacBurmese :
-            enc = wxFONTENCODING_MACBURMESE ;
-            break ;
-        case kTextEncodingMacKhmer :
-            enc = wxFONTENCODING_MACKHMER ;
-            break ;
-        case kTextEncodingMacThai :
-            enc = wxFONTENCODING_MACTHAI ;
-            break ;
-        case kTextEncodingMacLaotian :
-            enc = wxFONTENCODING_MACLAOTIAN ;
-            break ;
-        case kTextEncodingMacGeorgian :
-            enc = wxFONTENCODING_MACGEORGIAN ;
-            break ;
-        case kTextEncodingMacArmenian :
-            enc = wxFONTENCODING_MACARMENIAN ;
-            break ;
-        case kTextEncodingMacChineseSimp :
-            enc = wxFONTENCODING_MACCHINESESIMP ;
-            break ;
-        case kTextEncodingMacTibetan :
-            enc = wxFONTENCODING_MACTIBETAN ;
-            break ;
-        case kTextEncodingMacMongolian :
-            enc = wxFONTENCODING_MACMONGOLIAN ;
-            break ;
-        case kTextEncodingMacEthiopic :
-            enc = wxFONTENCODING_MACETHIOPIC ;
-            break ;
-        case kTextEncodingMacCentralEurRoman:
-            enc = wxFONTENCODING_MACCENTRALEUR  ;
-            break ;
-        case kTextEncodingMacVietnamese:
-            enc = wxFONTENCODING_MACVIATNAMESE  ;
-            break ;
-        case kTextEncodingMacExtArabic :
-            enc = wxFONTENCODING_MACARABICEXT ;
-            break ;
-        case kTextEncodingMacSymbol :
-            enc = wxFONTENCODING_MACSYMBOL ;
-            break ;
-        case kTextEncodingMacDingbats :
-            enc = wxFONTENCODING_MACDINGBATS ;
-            break ;
-        case kTextEncodingMacTurkish :
-            enc = wxFONTENCODING_MACTURKISH ;
-            break ;
-        case kTextEncodingMacCroatian :
-            enc = wxFONTENCODING_MACCROATIAN ;
-            break ;
-        case kTextEncodingMacIcelandic :
-            enc = wxFONTENCODING_MACICELANDIC ;
-            break ;
-        case kTextEncodingMacRomanian :
-            enc = wxFONTENCODING_MACROMANIAN ;
-            break ;
-        case kTextEncodingMacCeltic :
-            enc = wxFONTENCODING_MACCELTIC ;
-            break ;
-        case kTextEncodingMacGaelic :
-            enc = wxFONTENCODING_MACGAELIC ;
-            break ;
-        case kTextEncodingMacKeyboardGlyphs :
-            enc = wxFONTENCODING_MACKEYBOARD ;
-            break ;       
-       } ;
-       return enc ;
-}
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-
-//
-// CFStringRefs (Carbon only)
-//
-
-#if TARGET_CARBON
-
-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
-{
-       Release() ;
-
-       wxString str = st ;
-    wxMacConvertNewlines13To10( &str ) ;
-#if wxUSE_UNICODE
-#if SIZEOF_WCHAR_T == 2
-       m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
-        (UniChar*)str.wc_str() , str.Len() );
-#else
-       wxMBConvUTF16BE converter ;
-    size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
-    UniChar *unibuf = new UniChar[ unicharlen / sizeof(UniChar) + 1 ] ;
-    converter.WC2MB( (char*)unibuf , str.wc_str() , unicharlen ) ;
-    m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault ,
-        unibuf , unicharlen / sizeof(UniChar) ) ;
-    delete[] unibuf ;
-#endif
-#else // not wxUSE_UNICODE
-    m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
-        wxMacGetSystemEncFromFontEnc( encoding ) ) ;
-#endif
-    m_release = true ;
-}
-
-wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
-{
-    Size cflen = CFStringGetLength( m_cfs )  ;
-    size_t noChars ;
-    wxChar* buf = NULL ;
-    
-#if wxUSE_UNICODE
-#if SIZEOF_WCHAR_T == 2
-    buf = new wxChar[ cflen + 1 ] ; 
-    CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) buf ) ;
-    noChars = cflen ;
-#else
-    UniChar* unibuf = new UniChar[ cflen + 1 ] ;
-    CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) unibuf ) ;
-    unibuf[cflen] = 0 ;
-       wxMBConvUTF16BE converter ;
-       noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;
-    buf = new wxChar[ noChars + 1 ] ;
-    converter.MB2WC( buf , (const char*)unibuf , noChars ) ;
-    delete[] unibuf ;
-#endif
-#else
-    CFIndex cStrLen ;
-    CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
-        '?' , false , NULL , 0 , &cStrLen ) ;
-    buf = new wxChar[ cStrLen + 1 ] ; 
-    CFStringGetBytes( m_cfs , CFRangeMake(0, cflen) , wxMacGetSystemEncFromFontEnc( encoding ) ,
-        '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
-    noChars = cStrLen ;
-#endif
-
-    buf[noChars] = 0 ;
-    wxMacConvertNewlines10To13( buf ) ;
-    wxString result(buf) ;
-    delete[] buf ;
-    return result ;
-}
-
-#endif //TARGET_CARBON
-
-void wxMacConvertNewlines13To10( char * data ) 
-{        
-       char * buf = data ;
-    while( (buf=strchr(buf,0x0d)) != NULL )
-    {
-        *buf = 0x0a ;
-        buf++ ;
-    }
-}
-
-void wxMacConvertNewlines10To13( char * data )
-{        
-       char * buf = data ;
-    while( (buf=strchr(buf,0x0a)) != NULL )
-    {
-        *buf = 0x0d ;
-        buf++ ;
-    }
-}
-
-void wxMacConvertNewlines13To10( wxString * data ) 
-{        
-    size_t len = data->Length() ;
-
-    if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
-        return ;
-        
-    wxString temp(*data) ;
-    wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
-
-       wxMacConvertNewlines13To10( buf ) ;
-}
-
-void wxMacConvertNewlines10To13( wxString * data )
-{        
-    size_t len = data->Length() ;
-
-    if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
-        return ;
-
-    wxString temp(*data) ;
-    wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
-       wxMacConvertNewlines10To13( buf ) ;
-}
-
-
-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data ) 
-{        
-       wxChar * buf = data ;
-    while( (buf=wxStrchr(buf,0x0d)) != NULL )
-    {
-        *buf = 0x0a ;
-        buf++ ;
-    }
-}
-
-void wxMacConvertNewlines10To13( wxChar * data )
-{        
-       wxChar * buf =  data ;
-    while( (buf=wxStrchr(buf,0x0a)) != NULL )
-    {
-        *buf = 0x0d ;
-        buf++ ;
-    }
-}
-#endif
-

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

-#endif // wxUSE_GUI
-
-#if wxUSE_BASE

 
 extern ProcessSerialNumber gAppProcess ;
 
 
 extern ProcessSerialNumber gAppProcess ;
 


@@ -1290,12 +764,23 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
 // Control Access Support
 // ----------------------------------------------------------------------------
 
 // Control Access Support
 // ----------------------------------------------------------------------------
 

-OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize )
+void wxMacControl::Dispose()
+{
+    ::DisposeControl( m_controlRef ) ;
+    m_controlRef = NULL ;
+}
+
+void wxMacControl::SetReference( SInt32 data ) 
+{
+    SetControlReference( m_controlRef , data ) ;
+}
+
+OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const

 {
     return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;   
 }
 
 {
     return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;   
 }
 

-OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize )
+OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const

 {
     return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;   
 }
 {
     return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;   
 }


@@ -1339,145 +824,413 @@ void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
     HiliteControl( m_controlRef , kControlNoPart ) ;
 }
 
     HiliteControl( m_controlRef , kControlNoPart ) ;
 }
 

-// ----------------------------------------------------------------------------
-// debugging support
-// ----------------------------------------------------------------------------
+SInt32 wxMacControl::GetValue() const
+{ 
+    return ::GetControl32BitValue( m_controlRef ) ; 
+}

 
 

-#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+SInt32 wxMacControl::GetMaximum() const
+{ 
+    return ::GetControl32BitMaximum( m_controlRef ) ; 
+}

 
 

-// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+SInt32 wxMacControl::GetMinimum() const
+{ 
+    return ::GetControl32BitMinimum( m_controlRef ) ; 
+}

 
 

-#ifndef __MetroNubUtils__
-#include "MetroNubUtils.h"
-#endif
+void wxMacControl::SetValue( SInt32 v ) 
+{ 
+    ::SetControl32BitValue( m_controlRef , v ) ; 
+}

 
 

-#ifndef __GESTALT__
-#include <Gestalt.h>
-#endif
+void wxMacControl::SetMinimum( SInt32 v ) 
+{ 
+    ::SetControl32BitMinimum( m_controlRef , v ) ; 
+}

 
 

-#if TARGET_API_MAC_CARBON
+void wxMacControl::SetMaximum( SInt32 v ) 
+{ 
+    ::SetControl32BitMaximum( m_controlRef , v ) ;
+}

 
 

-    #include <CodeFragments.h>
+void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+{
+    ::SetControl32BitMinimum( m_controlRef , minimum ) ;
+    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
+    ::SetControl32BitValue( m_controlRef , value ) ;
+}

 
 

-    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart ) 
+{
+    return SetKeyboardFocus(  GetControlOwner( m_controlRef )  , 
+        m_controlRef , focusPart ) ;
+}

 
 

-    ProcPtr gCallUniversalProc_Proc = NULL;
+bool wxMacControl::HasFocus() const 
+{
+    ControlRef control ;
+    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+    return control == m_controlRef ;
+}

 
 

-#endif
+bool wxMacControl::NeedsFocusRect() const 
+{
+    return false ;
+}

 
 

-static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+void wxMacControl::VisibilityChanged(bool shown) 
+{
+}

 
 

-static long fRunOnce = false;
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) 
+{
+    m_font = font ;
+       ControlFontStyleRec     fontStyle;
+       if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
+       {
+           switch( font.MacGetThemeFontID() )
+           {
+               case kThemeSmallSystemFont :    fontStyle.font = kControlFontSmallSystemFont ;  break ;
+               case 109 /*mini font */ :       fontStyle.font = -5 ;                           break ;
+               case kThemeSystemFont :         fontStyle.font = kControlFontBigSystemFont ;    break ;
+               default :                       fontStyle.font = kControlFontBigSystemFont ;    break ;
+           }
+           fontStyle.flags = kControlUseFontMask ; 
+       }
+       else
+       {
+           fontStyle.font = font.MacGetFontNum() ;
+           fontStyle.style = font.MacGetFontStyle() ;
+           fontStyle.size = font.MacGetFontSize() ;
+           fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
+       }

 
 

-/* ---------------------------------------------------------------------------
-        IsMetroNubInstalled
-   --------------------------------------------------------------------------- */
+    fontStyle.just = teJustLeft ;
+    fontStyle.flags |= kControlUseJustMask ;
+    if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+        fontStyle.just = teJustCenter ;
+    else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+        fontStyle.just = teJustRight ;

 
 

-Boolean IsMetroNubInstalled()
-{
-    if (!fRunOnce)
+    
+    // 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 )

     {
     {

-        long result, value;
-
-        fRunOnce = true;
-        gMetroNubEntry = NULL;
+        fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
+        fontStyle.flags |= kControlUseForeColorMask ;
+    }
+       
+       ::SetControlFontStyle( m_controlRef , &fontStyle );
+}

 
 

-        if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
-        {
-            /* look for MetroNub's Gestalt selector */
-            if (Gestalt(kMetroNubUserSignature, &result) == noErr)
-            {
+void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) ) 
+{
+    // TODO 
+    // setting up a color proc is not recommended anymore
+}

 
 

-            #if TARGET_API_MAC_CARBON
-                if (gCallUniversalProc_Proc == NULL)
-                {
-                    CFragConnectionID   connectionID;
-                    Ptr                 mainAddress;
-                    Str255              errorString;
-                    ProcPtr             symbolAddress;
-                    OSErr               err;
-                    CFragSymbolClass    symbolClass;
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+{
+    ::SetControl32BitMinimum( m_controlRef , minimum ) ;
+    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
+}

 
 

-                    symbolAddress = NULL;
-                    err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
-                                           &connectionID, &mainAddress, errorString);
+short wxMacControl::HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) 
+{
+    return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
+}

 
 

-                    if (err != noErr)
-                    {
-                        gCallUniversalProc_Proc = NULL;
-                        goto end;
-                    }
+void wxMacControl::SetActionProc( ControlActionUPP   actionProc )
+{
+    SetControlAction( m_controlRef , actionProc ) ;
+}

 
 

-                    err = FindSymbol(connectionID, "\pCallUniversalProc",
-                                    (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+void wxMacControl::SetViewSize( SInt32 viewSize )
+{
+    SetControlViewSize(m_controlRef , viewSize ) ;
+}

 
 

-                    if (err != noErr)
-                    {
-                        gCallUniversalProc_Proc = NULL;
-                        goto end;
-                    }
-                }
-            #endif
+SInt32 wxMacControl::GetViewSize() const
+{
+    return GetControlViewSize( m_controlRef ) ;
+}

 
 

-                {
-                    MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+bool wxMacControl::IsVisible() const 
+{
+    return IsControlVisible( m_controlRef ) ;
+}

 
 

-                    /* make sure the version of the API is compatible */
-                    if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
-                        kMetroNubUserAPIVersion <= block->apiHiVersion)
-                        gMetroNubEntry = block;        /* success! */
-                }
+void wxMacControl::SetVisibility( bool visible , bool redraw ) 
+{
+    SetControlVisibility( m_controlRef , visible , redraw ) ;
+}

 
 

-            }
-        }
-    }
+bool wxMacControl::IsEnabled() const 
+{
+#if TARGET_API_MAC_OSX
+    return IsControlEnabled( m_controlRef ) ;
+#else
+    return IsControlActive( m_controlRef ) ;
+#endif
+}

 
 

-end:
+bool wxMacControl::IsActive() const 
+{
+    return IsControlActive( m_controlRef ) ;
+}

 
 

-#if TARGET_API_MAC_CARBON
-    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+void wxMacControl::Enable( bool enable ) 
+{
+#if TARGET_API_MAC_OSX
+    if ( enable )
+        EnableControl( m_controlRef ) ;
+    else
+        DisableControl( m_controlRef ) ;

 #else
 #else

-    return (gMetroNubEntry != NULL);
+    if ( enable )
+        ActivateControl( m_controlRef ) ;
+    else
+        DeactivateControl( m_controlRef ) ;

 #endif
 }
 
 #endif
 }
 

-/* ---------------------------------------------------------------------------
-        IsMWDebuggerRunning                                            [v1 API]
-   --------------------------------------------------------------------------- */
+void wxMacControl::SetDrawingEnabled( bool enable ) 
+{
+#if TARGET_API_MAC_OSX
+    HIViewSetDrawingEnabled( m_controlRef , enable ) ;
+#endif
+}

 
 

-Boolean IsMWDebuggerRunning()
+bool wxMacControl::GetNeedsDisplay() const 

 {
 {

-    if (IsMetroNubInstalled())
-        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+#if TARGET_API_MAC_OSX
+    return HIViewGetNeedsDisplay( m_controlRef ) ;
+#else
+    return false ;
+#endif
+}
+
+void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where ) 
+{
+#if TARGET_API_MAC_OSX
+    if ( where != NULL )
+        HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;

     else
     else

-        return false;
+        HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
+#endif

 }
 
 }
 

-/* ---------------------------------------------------------------------------
-        AmIBeingMWDebugged                                            [v1 API]
-   --------------------------------------------------------------------------- */
+void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) 
+{
+#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 ;
+#endif
+}

 
 

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

 {
 {

-    if (IsMetroNubInstalled())
-        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+#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 ) ;
+#endif
+
+}
+
+void wxMacControl::GetRect( Rect *r ) 
+{
+    GetControlBounds( m_controlRef , r ) ;
+}
+
+void wxMacControl::GetRectInWindowCoords( Rect *r ) 
+{
+    UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
+}
+
+void wxMacControl::GetBestRect( Rect *r ) 
+{
+    short   baselineoffset ;
+    GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
+}
+
+void wxMacControl::SetTitle( const wxString &title ) 
+{
+    wxFontEncoding encoding;
+
+    if ( m_font.Ok() )
+        encoding = m_font.GetEncoding();

     else
     else

-        return false;
+        encoding = wxFont::GetDefaultEncoding();
+    
+    UMASetControlTitle(  m_controlRef , title , encoding ) ;

 }
 
 }
 

-extern bool WXDLLEXPORT wxIsDebuggerRunning()
+void wxMacControl::GetFeatures( UInt32 * features )

 {
 {

-    return IsMWDebuggerRunning() && AmIBeingMWDebugged();
+    GetControlFeatures( m_controlRef , features ) ;

 }
 
 }
 

+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) 
+{
+    return GetControlRegion( m_controlRef , partCode , region ) ;
+}
+
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other ) 
+{
+#if TARGET_API_MAC_OSX
+    return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow, 
+       (other != NULL) ? other->m_controlRef : NULL) ;

 #else
 #else

+    return 0 ;
+#endif
+}

 
 

-extern bool WXDLLEXPORT wxIsDebuggerRunning()
+
+#if TARGET_API_MAC_OSX
+// SetNeedsDisplay would not invalidate the children
+static void InvalidateControlAndChildren( HIViewRef control )

 {
 {

-    return false;
+    HIViewSetNeedsDisplay( control , true ) ;
+    UInt16 childrenCount = 0 ;
+    OSStatus err = CountSubControls( control , &childrenCount ) ; 
+    if ( err == errControlIsNotEmbedder )
+        return ;
+    wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
+
+    for ( UInt16 i = childrenCount ; i >=1  ; --i )
+    {
+        HIViewRef child ;
+        err = GetIndexedSubControl( control , i , & child ) ;
+        if ( err == errControlIsNotEmbedder )
+            return ;
+        InvalidateControlAndChildren( child ) ;
+    }

 }
 }

+#endif

 
 

-#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+void wxMacControl::InvalidateWithChildren() 
+{
+#if TARGET_API_MAC_OSX
+    InvalidateControlAndChildren( m_controlRef ) ;
+#endif
+}
+
+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) ;
+    HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
+#endif
+}
+
+
+// SetNeedsDisplay would not invalidate the children
+
+//
+// Databrowser
+//
+
+OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options ) 
+{
+    return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
+}
+
+OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+        DataBrowserTableViewColumnIndex position ) 
+{
+    return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
+}
+
+OSStatus wxMacControl::AutoSizeListViewColumns()
+{
+    return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
+}
+
+OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert ) 
+{
+    return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
+}
+
+OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+{
+    return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
+}

 
 

+OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height) 
+{
+    return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
+}
+
+OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks *  callbacks) 
+{
+    return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
+}
+
+OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
+        const DataBrowserItemID* items,                
+        DataBrowserPropertyID preSortProperty,
+        DataBrowserPropertyID propertyID ) 
+{
+    return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
+}
+
+bool wxMacControl::IsItemSelected( DataBrowserItemID item ) 
+{
+    return IsDataBrowserItemSelected( m_controlRef , item ) ;
+}
+
+OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID* items,                
+            DataBrowserPropertyID preSortProperty ) 
+{
+    return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+}
+
+OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
+            const DataBrowserItemID* items,                
+            DataBrowserPropertyID preSortProperty ) 
+{
+    return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+}
+
+OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
+            DataBrowserPropertyID propertyID,
+            DataBrowserRevealOptions options ) 
+{
+    return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
+}
+
+OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
+            const DataBrowserItemID * items,
+            DataBrowserSetOption operation ) 
+{
+    return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
+}
+
+OSStatus wxMacControl::GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) 
+{
+    return GetDataBrowserSelectionAnchor( m_controlRef , first , last ) ;
+}
+
+//
+// Tab Control
+//
+ 
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) 
+{
+    return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
+}
+ 

 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI