correct hhp2cached path

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index cf7d76b624b031ab9fcd4e9f1d2e882d764c5a53..02f46c0bc5f69b170aa8b6e25a56d72e6556ee0f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1,29 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Various utilities
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     Various utilities
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// 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/utils.h"

-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #if wxUSE_GUI
+        #include "wx/toplevel.h"
+        #include "wx/font.h"
+    #endif
+#endif
+

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

-       #include "wx/font.h"
-#else
-       #include "wx/intl.h"

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


@@ -33,1867 +35,1976 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#include "MoreFilesX.h"
+// #include "MoreFilesX.h"

 
 

-#ifndef __DARWIN__
-#include <Threads.h>
-#include <Sound.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    #include <AudioToolbox/AudioServices.h>
+#endif
+
+#if wxUSE_GUI
+    #include <CoreServices/CoreServices.h>
+    #include <Carbon/Carbon.h>
+    #include "wx/mac/private/timer.h"
+#endif // wxUSE_GUI
+
+#include "wx/evtloop.h"
+#include "wx/mac/private.h"
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+#if __MWERKS__ < 0x4100
+    #include <wtime.h>
+#endif
+#endif
+
+#if wxUSE_BASE
+
+// our OS version is the same in non GUI and GUI cases
+wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+    SInt32 theSystem;
+    Gestalt(gestaltSystemVersion, &theSystem);
+
+    if ( majorVsn != NULL )
+        *majorVsn = (theSystem >> 8);
+
+    if ( minorVsn != NULL )
+        *minorVsn = (theSystem & 0xFF);
+
+#if defined( __DARWIN__ )
+    return wxOS_MAC_OSX_DARWIN;
+#else
+    return wxOS_MAC_OS;

 #endif
 #endif

+}

 
 

-#if TARGET_API_MAC_OSX
-#include <CoreServices/CoreServices.h>
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    // TODO : try to find out ...
+    return false;
+}
+
+// Emit a beeeeeep
+void wxBell()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    if ( AudioServicesPlayAlertSound )
+        AudioServicesPlayAlertSound(kUserPreferredAlert);
+    else
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+        SysBeep(30);

 #else
 #else

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

 #endif
 #endif

+}

 
 

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

 
 

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

 
 

-#if defined(__MWERKS__) && wxUSE_UNICODE
-    #include <wtime.h>
+#if wxUSE_GUI
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+    // We suppose that toolkit version is the same as OS version under Mac
+    wxGetOsVersion(verMaj, verMin);
+
+    return wxPORT_MAC;
+}
+
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop;
+}
+
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
+{
+    return new wxCarbonTimerImpl(timer);
+}
+
+int gs_wxBusyCursorCount = 0;
+extern wxCursor    gMacCurrentCursor;
+wxCursor        gMacStoredActiveCursor;
+
+// Set the cursor to the busy cursor for all windows
+void wxBeginBusyCursor(const wxCursor *cursor)
+{
+    if (gs_wxBusyCursorCount++ == 0)
+    {
+        gMacStoredActiveCursor = gMacCurrentCursor;
+        cursor->MacInstall();
+
+        wxSetCursor(*cursor);
+    }
+    //else: nothing to do, already set
+}
+
+// Restore cursor to normal
+void wxEndBusyCursor()
+{
+    wxCHECK_RET( gs_wxBusyCursorCount > 0,
+        wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
+
+    if (--gs_wxBusyCursorCount == 0)
+    {
+        gMacStoredActiveCursor.MacInstall();
+        gMacStoredActiveCursor = wxNullCursor;
+
+        wxSetCursor(wxNullCursor);
+    }
+}
+
+// true if we're between the above two calls
+bool wxIsBusy()
+{
+    return (gs_wxBusyCursorCount > 0);
+}
+
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
+wxString wxMacFindFolderNoSeparator( short        vol,
+              OSType       folderType,
+              Boolean      createFolder)
+{
+    FSRef fsRef;
+    wxString strDir;
+
+    if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
+    {
+        strDir = wxMacFSRefToPath( &fsRef );
+    }
+
+    return strDir;
+}
+
+wxString wxMacFindFolder( short        vol,
+              OSType       folderType,
+              Boolean      createFolder)
+{
+    return wxMacFindFolderNoSeparator(vol, folderType, createFolder) + wxFILE_SEP_PATH;
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+// Check whether this window wants to process messages, e.g. Stop button
+// in long calculations.
+bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))
+{
+    // TODO
+    return false;
+}
+
+void wxGetMousePosition( int* x, int* y )
+{
+#if wxMAC_USE_QUICKDRAW
+    Point pt;
+    GetGlobalMouse(&pt);
+    *x = pt.h;
+    *y = pt.v;
+#else
+    // TODO
+#endif
+};
+
+// Return true if we have a colour display
+bool wxColourDisplay()
+{
+    return true;
+}
+
+// Returns depth of screen
+int wxDisplayDepth()
+{
+#if wxMAC_USE_QUICKDRAW
+    int theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID());
+    Rect globRect;
+    SetRect(&globRect, -32760, -32760, 32760, 32760);
+    GDHandle    theMaxDevice;
+
+    theMaxDevice = GetMaxDevice(&globRect);
+    if (theMaxDevice != NULL)
+        theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+
+    return theDepth;
+#else
+    return 32; // TODO
+#endif
+}
+
+// Get size of display
+void wxDisplaySize(int *width, int *height)
+{
+    // TODO adapt for multi-displays
+    CGRect bounds = CGDisplayBounds(CGMainDisplayID());
+    if ( width )
+        *width = (int)bounds.size.width ;
+    if ( height )
+        *height = (int)bounds.size.height;
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+    wxDisplaySize(width, height);
+    // on mac 72 is fixed (at least now;-)
+    float cvPt2Mm = 25.4 / 72;
+
+    if (width != NULL)
+        *width = int( *width * cvPt2Mm );
+
+    if (height != NULL)
+        *height = int( *height * cvPt2Mm );
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if wxMAC_USE_QUICKDRAW
+
+        HIRect bounds ;
+        HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+            &bounds);
+    if ( x )
+        *x = bounds.origin.x;
+    if ( y )
+        *y = bounds.origin.y;
+    if ( width )
+        *width = bounds.size.width;
+    if ( height )
+        *height = bounds.size.height;
+#else
+    int w, h;
+    wxDisplaySize(&w,&h);
+    if ( x )
+        *x = 0;
+    if ( y )
+        *y = 24;
+    if ( width )
+        *width = w;
+    if ( height )
+        *height = h-24;

 #endif
 #endif

+#else
+    Rect r;
+    GetAvailableWindowPositioningBounds( GetMainDevice() , &r );
+    if ( x )
+        *x = r.left;
+    if ( y )
+        *y = r.top;
+    if ( width )
+        *width = r.right - r.left;
+    if ( height )
+        *height = r.bottom - r.top;
+#endif
+}
+
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
+#include <sys/utsname.h>
+
+wxString wxGetOsDescription()
+{
+    struct utsname name;
+    uname(&name);
+    return wxString::Format(_T("Mac OS X (%s %s %s)"),
+            wxString::FromAscii(name.sysname).c_str(),
+            wxString::FromAscii(name.release).c_str(),
+            wxString::FromAscii(name.machine).c_str());
+}
+
+#ifndef __DARWIN__
+wxString wxGetUserHome (const wxString& user)
+{
+    // TODO
+    return wxString();
+}
+
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
+{
+    if ( path.empty() )
+        return false;
+
+    wxString p = path;
+    if (p[0u] == ':' )
+      p = wxGetCwd() + p;
+
+    int pos = p.Find(':');
+    if ( pos != wxNOT_FOUND )
+      p = p.Mid(1,pos);
+
+    p = p + wxT(":");
+
+    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 = wxDiskspaceSize_t( totalBytes );
+                if ( pFree )
+                    *pFree = wxDiskspaceSize_t( freeBytes );
+            }
+        }
+    }
+
+    return err == noErr;
+}
+#endif // !__DARWIN__
+
+//---------------------------------------------------------------------------
+// wxMac Specific utility functions
+//---------------------------------------------------------------------------
+
+void wxMacStringToPascal( const wxString&from , StringPtr to )
+{
+    wxCharBuffer buf = from.mb_str( wxConvLocal );
+    int len = strlen(buf);
+
+    if ( len > 255 )
+        len = 255;
+    to[0] = len;
+    memcpy( (char*) &to[1] , buf , len );
+}
+
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )
+{
+    return wxString( (char*) &from[1] , wxConvLocal , from[0] );
+}
+
+// ----------------------------------------------------------------------------
+// Common Event Support
+// ----------------------------------------------------------------------------
+
+void wxMacWakeUp()
+{
+    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 )
+    {
+
+        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
+}
+
+#endif // wxUSE_BASE
+
+#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
+// ----------------------------------------------------------------------------
+
+OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
+{
+    return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData );
+}
+
+OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
+{
+    return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData );
+}
+
+// ----------------------------------------------------------------------------
+// Control Access Support
+// ----------------------------------------------------------------------------
+
+#if wxMAC_USE_QUICKDRAW
+
+IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
+
+wxMacControl::wxMacControl()
+{
+    Init();
+}
+
+wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
+{
+    Init();
+    m_peer = peer;
+    m_isRootControl = isRootControl;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , ControlRef control )
+{
+    Init();
+    m_peer = peer;
+    m_controlRef = control;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , WXWidget control )
+{
+    Init();
+    m_peer = peer;
+    m_controlRef = (ControlRef) control;
+}
+
+wxMacControl::~wxMacControl()
+{
+}
+
+void wxMacControl::Init()
+{
+    m_peer = NULL;
+    m_controlRef = NULL;
+    m_needsFocusRect = false;
+    m_isRootControl = false;
+}
+
+void wxMacControl::Dispose()
+{
+    wxASSERT_MSG( m_controlRef != NULL , wxT("Control Handle already NULL, Dispose called twice ?") );
+    wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
+
+    // we cannot check the ref count here anymore, as autorelease objects might delete their refs later
+    // we can have situations when being embedded, where the control gets deleted behind our back, so only
+    // CFRelease if we are safe
+    if ( IsValidControlHandle(m_controlRef) )
+        CFRelease(m_controlRef);
+    m_controlRef = NULL;
+}
+
+void wxMacControl::SetReference( URefCon 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 );
+}
+
+OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
+{
+    return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize );
+}
+
+OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
+{
+    return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData );
+}
+
+OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
+{
+    return SendEventToEventTargetWithOptions( event,
+        HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
+}
+
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
+{
+    wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess );
+
+    event.SetParameter<HICommand>(kEventParamDirectObject,command);
+
+    return SendEvent( event , inOptions );
+}
+
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  )
+{
+    HICommand command;
+
+    memset( &command, 0 , sizeof(command) );
+    command.commandID = commandID;
+    return SendHICommand( command , inOptions );
+}
+
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
+{
+    unsigned long finalTicks;

 
 

-// ---------------------------------------------------------------------------
-// code used in both base and GUI compilation
-// ---------------------------------------------------------------------------
+    HiliteControl( m_controlRef , part );
+    Delay( ticks , &finalTicks );
+    HiliteControl( m_controlRef , kControlNoPart );
+}

 
 

-// our OS version is the same in non GUI and GUI cases
-static int DoGetOSVersion(int *majorVsn, int *minorVsn)
+SInt32 wxMacControl::GetValue() const

 {
 {

-    long theSystem ;
+    return ::GetControl32BitValue( m_controlRef );
+}

 
 

-    // are there x-platform conventions ?
+SInt32 wxMacControl::GetMaximum() const
+{
+    return ::GetControl32BitMaximum( m_controlRef );
+}

 
 

-    Gestalt(gestaltSystemVersion, &theSystem) ;
-    if (minorVsn != NULL) {
-        *minorVsn = (theSystem & 0xFF ) ;
-    }
-    if (majorVsn != NULL) {
-        *majorVsn = (theSystem >> 8 ) ;
-    }
-#ifdef __DARWIN__
-    return wxMAC_DARWIN;
-#else
-    return wxMAC;
-#endif
+SInt32 wxMacControl::GetMinimum() const
+{
+    return ::GetControl32BitMinimum( m_controlRef );

 }
 
 }
 

+void wxMacControl::SetValue( SInt32 v )
+{
+    ::SetControl32BitValue( m_controlRef , v );
+}

 
 

-#if wxUSE_BASE
+void wxMacControl::SetMinimum( SInt32 v )
+{
+    ::SetControl32BitMinimum( m_controlRef , v );
+}

 
 

-// ----------------------------------------------------------------------------
-// debugging support
-// ----------------------------------------------------------------------------
+void wxMacControl::SetMaximum( SInt32 v )
+{
+    ::SetControl32BitMaximum( m_controlRef , v );
+}

 
 

-#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+{
+    ::SetControl32BitMinimum( m_controlRef , minimum );
+    ::SetControl32BitMaximum( m_controlRef , maximum );
+    ::SetControl32BitValue( m_controlRef , value );
+}

 
 

-// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
+{
+    return SetKeyboardFocus( GetControlOwner( m_controlRef ), m_controlRef, focusPart );
+}

 
 

-#ifndef __MetroNubUtils__
-#include "MetroNubUtils.h"
-#endif
+bool wxMacControl::HasFocus() const
+{
+    ControlRef control;
+    GetKeyboardFocus( GetUserFocusWindow() , &control );
+    return control == m_controlRef;
+}

 
 

-#ifndef __GESTALT__
-#include <Gestalt.h>
-#endif
+void wxMacControl::SetNeedsFocusRect( bool needs )
+{
+    m_needsFocusRect = needs;
+}

 
 

-#if TARGET_API_MAC_CARBON
+bool wxMacControl::NeedsFocusRect() const
+{
+    return m_needsFocusRect;
+}

 
 

-    #include <CodeFragments.h>
+void wxMacControl::VisibilityChanged(bool WXUNUSED(shown))
+{
+}

 
 

-    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+void wxMacControl::SuperChangedPosition()
+{
+}

 
 

-    ProcPtr gCallUniversalProc_Proc = NULL;
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+{
+    m_font = font;
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        HIViewPartCode part = 0;
+        HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault;
+        if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+            flush = kHIThemeTextHorizontalFlushCenter;
+        else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+            flush = kHIThemeTextHorizontalFlushRight;
+        HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() );
+        HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
+
+        if ( foreground != *wxBLACK )
+        {
+            ControlFontStyleRec fontStyle;
+            foreground.GetRGBColor( &fontStyle.foreColor );
+            fontStyle.flags = kControlUseForeColorMask;
+            ::SetControlFontStyle( m_controlRef , &fontStyle );
+        }

 
 

+    }

 #endif
 #endif

+#if wxMAC_USE_ATSU_TEXT
+    ControlFontStyleRec fontStyle;
+    if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
+    {
+        switch ( font.MacGetThemeFontID() )
+        {
+            case kThemeSmallSystemFont :
+                fontStyle.font = kControlFontSmallSystemFont;
+                break;

 
 

-static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+            case 109 : // mini font
+                fontStyle.font = -5;
+                break;

 
 

-static long fRunOnce = false;
+            case kThemeSystemFont :
+                fontStyle.font = kControlFontBigSystemFont;
+                break;

 
 

-/* ---------------------------------------------------------------------------
-        IsMetroNubInstalled
-   --------------------------------------------------------------------------- */
+            default :
+                fontStyle.font = kControlFontBigSystemFont;
+                break;
+        }

 
 

-Boolean IsMetroNubInstalled()
-{
-    if (!fRunOnce)
+        fontStyle.flags = kControlUseFontMask;
+    }
+    else

     {
     {

-        long result, value;
+        fontStyle.font = font.MacGetFontNum();
+        fontStyle.style = font.MacGetFontStyle();
+        fontStyle.size = font.MacGetFontSize();
+        fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask;
+    }

 
 

-        fRunOnce = true;
-        gMetroNubEntry = NULL;
+    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;

 
 

-        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! */
-                }
+    // 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 )
+    {
+        foreground.GetRGBColor( &fontStyle.foreColor );
+        fontStyle.flags |= kControlUseForeColorMask;

     }
 
     }
 

-end:
-
-#if TARGET_API_MAC_CARBON
-    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
-#else
-    return (gMetroNubEntry != NULL);
+    ::SetControlFontStyle( m_controlRef , &fontStyle );

 #endif
 }
 
 #endif
 }
 

-/* ---------------------------------------------------------------------------
-        IsMWDebuggerRunning                                            [v1 API]
-   --------------------------------------------------------------------------- */
-
-Boolean IsMWDebuggerRunning()
+void wxMacControl::SetBackgroundColour( const wxColour &WXUNUSED(col) )

 {
 {

-    if (IsMetroNubInstalled())
-        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
-    else
-        return false;
+//    HITextViewSetBackgroundColor( m_textView , color );

 }
 
 }
 

-/* ---------------------------------------------------------------------------
-        AmIBeingMWDebugged                                            [v1 API]
-   --------------------------------------------------------------------------- */
-
-Boolean AmIBeingMWDebugged()
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )

 {
 {

-    if (IsMetroNubInstalled())
-        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
-    else
-        return false;
+    ::SetControl32BitMinimum( m_controlRef , minimum );
+    ::SetControl32BitMaximum( m_controlRef , maximum );

 }
 
 }
 

-extern bool WXDLLEXPORT wxIsDebuggerRunning()
+short wxMacControl::HandleKey( SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers )

 {
 {

-    return IsMWDebuggerRunning() && AmIBeingMWDebugged();
-}
-
+#ifndef __LP64__
+    return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );

 #else
 #else

+    return 0;
+#endif
+}

 
 

-extern bool WXDLLEXPORT wxIsDebuggerRunning()
+void wxMacControl::SetActionProc( ControlActionUPP   actionProc )

 {
 {

-    return false;
+    SetControlAction( m_controlRef , actionProc );

 }
 
 }
 

-#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
-
+void wxMacControl::SetViewSize( SInt32 viewSize )
+{
+    SetControlViewSize(m_controlRef , viewSize );
+}

 
 

-#ifndef __DARWIN__
-// defined in unix/utilsunx.cpp for Mac OS X
+SInt32 wxMacControl::GetViewSize() const
+{
+    return GetControlViewSize( m_controlRef );
+}

 
 

-// get full hostname (with domain name if possible)
-bool wxGetFullHostName(wxChar *buf, int maxSize)
+bool wxMacControl::IsVisible() const

 {
 {

-    return wxGetHostName(buf, maxSize);
+    return IsControlVisible( m_controlRef );

 }
 
 }
 

-// Get hostname only (without domain name)
-bool wxGetHostName(wxChar *buf, int maxSize)
+void wxMacControl::SetVisibility( bool visible , bool redraw )

 {
 {

-    // Gets Chooser name of user by examining a System resource.
+    SetControlVisibility( m_controlRef , visible , redraw );
+}

 
 

-    const short kComputerNameID = -16413;
+bool wxMacControl::IsEnabled() const
+{
+    return IsControlEnabled( m_controlRef );
+}

 
 

-    short oldResFile = CurResFile() ;
-    UseResFile(0);
-    StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
-    UseResFile(oldResFile);
+bool wxMacControl::IsActive() const
+{
+    return IsControlActive( m_controlRef );
+}

 
 

-    if (chooserName && *chooserName)
-    {
-        HLock( (Handle) chooserName ) ;
-        wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
-        HUnlock( (Handle) chooserName ) ;
-        ReleaseResource( (Handle) chooserName ) ;
-        wxStrncpy( buf , name , maxSize - 1 ) ;
-    }
+void wxMacControl::Enable( bool enable )
+{
+    if ( enable )
+        EnableControl( m_controlRef );

     else
     else

-        buf[0] = 0 ;
-
-  return TRUE;
+        DisableControl( m_controlRef );

 }
 
 }
 

-// Get user ID e.g. jacs
-bool wxGetUserId(wxChar *buf, int maxSize)
+void wxMacControl::SetDrawingEnabled( bool enable )

 {
 {

-  return wxGetUserName( buf , maxSize ) ;
+    HIViewSetDrawingEnabled( m_controlRef , enable );

 }
 
 }
 

-const wxChar* wxGetHomeDir(wxString *pstr)
+bool wxMacControl::GetNeedsDisplay() const

 {
 {

-    *pstr = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
-    return pstr->c_str() ;
+    return HIViewGetNeedsDisplay( m_controlRef );

 }
 
 }
 

-// Get user name e.g. Stefan Csomor
-bool wxGetUserName(wxChar *buf, int maxSize)
+void wxMacControl::SetNeedsDisplay( RgnHandle where )

 {
 {

-    // Gets Chooser name of user by examining a System resource.
+    if ( !IsVisible() )
+        return;

 
 

-    const short kChooserNameID = -16096;
+    HIViewSetNeedsDisplayInRegion( m_controlRef , where , true );
+}

 
 

-    short oldResFile = CurResFile() ;
-    UseResFile(0);
-    StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
-    UseResFile(oldResFile);
+void wxMacControl::SetNeedsDisplay( Rect* where )
+{
+    if ( !IsVisible() )
+        return;

 
 

-    if (chooserName && *chooserName)
+    if ( where != NULL )

     {
     {

-        HLock( (Handle) chooserName ) ;
-        wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
-        HUnlock( (Handle) chooserName ) ;
-        ReleaseResource( (Handle) chooserName ) ;
-        wxStrncpy( buf , name , maxSize - 1 ) ;
+        RgnHandle update = NewRgn();
+        RectRgn( update , where );
+        HIViewSetNeedsDisplayInRegion( m_controlRef , update , true );
+        DisposeRgn( update );

     }
     else
     }
     else

-        buf[0] = 0 ;
-
-  return TRUE;
+        HIViewSetNeedsDisplay( m_controlRef , true );

 }
 
 }
 

-int wxKill(long pid, wxSignal sig , wxKillError *rc )
+void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )

 {
 {

-    // TODO
-    return 0;
+    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;

 }
 
 }
 

-WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+void wxMacControl::SetRect( Rect *r )

 {
 {

-    // TODO : under classic there is no environement support, under X yes
-    return false ;
+        //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

 }
 
 }
 

-// set the env var name to the given value, return TRUE on success
-WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+void wxMacControl::GetRect( Rect *r )

 {
 {

-    // TODO : under classic there is no environement support, under X yes
-    return false ;
+    GetControlBounds( m_controlRef , r );

 }
 
 }
 

-//
-// Execute a program in an Interactive Shell
-//
-bool wxShell(const wxString& command)
+void wxMacControl::GetRectInWindowCoords( Rect *r )

 {
 {

-    // TODO
-    return FALSE;
+    GetControlBounds( m_controlRef , r ) ;
+
+    WindowRef tlwref = GetControlOwner( m_controlRef ) ;
+
+    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    if ( tlwwx != NULL )
+    {
+        ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+        HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(m_controlRef) , rootControl ) ;
+        OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ;
+    }

 }
 
 }
 

-// Shutdown or reboot the PC
-bool wxShutdown(wxShutdownFlags wFlags)
+void wxMacControl::GetBestRect( Rect *r )

 {
 {

-    // TODO
-    return FALSE;
+    short   baselineoffset;
+
+    GetBestControlRect( m_controlRef , r , &baselineoffset );

 }
 
 }
 

-// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
+void wxMacControl::SetLabel( const wxString &title )

 {
 {

-    return FreeMem() ;
-}
+    wxFontEncoding encoding;

 
 

-#ifndef __DARWIN__
+    if ( m_font.Ok() )
+        encoding = m_font.GetEncoding();
+    else
+        encoding = wxFont::GetDefaultEncoding();

 
 

-void wxMicroSleep(unsigned long microseconds)
-{
-       AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime());
-       MPDelayUntil( & wakeup);
+    SetControlTitleWithCFString( m_controlRef , wxCFStringRef( title , encoding ) );

 }
 
 }
 

-void wxMilliSleep(unsigned long milliseconds)
+void wxMacControl::GetFeatures( UInt32 * features )

 {
 {

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

 }
 
 }
 

-void wxSleep(int nSecs)
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )

 {
 {

-    wxMilliSleep(1000*nSecs);
+    OSStatus err = GetControlRegion( m_controlRef , partCode , region );
+    return err;

 }
 
 }
 

-#endif
-
-// Consume all events until no more left
-void wxFlushEvents()
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )

 {
 {

+    return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
+       (other != NULL) ? other->m_controlRef : NULL);

 }
 
 }
 

-#endif // !__DARWIN__
-
-// Emit a beeeeeep
-void wxBell()
+// SetNeedsDisplay would not invalidate the children
+static void InvalidateControlAndChildren( HIViewRef control )

 {
 {

-    SysBeep(30);
-}
+    HIViewSetNeedsDisplay( control , true );
+    UInt16 childrenCount = 0;
+    OSStatus err = CountSubControls( control , &childrenCount );
+    if ( err == errControlIsNotEmbedder )
+        return;

 
 

-wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
-{
-    static wxToolkitInfo info;
-    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
-    info.name = _T("wxBase");
-    return info;
-}
+    wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") );

 
 

-#endif // wxUSE_BASE
+    for ( UInt16 i = childrenCount; i >=1; --i )
+    {
+        HIViewRef child;

 
 

-#if wxUSE_GUI
+        err = GetIndexedSubControl( control , i , & child );
+        if ( err == errControlIsNotEmbedder )
+            return;

 
 

-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
-{
-    static wxToolkitInfo info;
-    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
-    return info;
+        InvalidateControlAndChildren( child );
+    }

 }
 
 }
 

-// Reading and writing resources (eg WIN.INI, .Xdefaults)
-#if wxUSE_RESOURCES
-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
+void wxMacControl::InvalidateWithChildren()

 {
 {

-    // TODO
-    return FALSE;
+    InvalidateControlAndChildren( m_controlRef );

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
+void wxMacControl::ScrollRect( wxRect *r , int dx , int dy )

 {
 {

-    wxString buf;
-    buf.Printf(wxT("%.4f"), value);
+    wxASSERT( r != NULL );

 
 

-    return wxWriteResource(section, entry, buf, file);
+    HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height);
+    HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy );

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
-{
-    wxString buf;
-    buf.Printf(wxT("%ld"), value);
+OSType wxMacCreator = 'WXMC';
+OSType wxMacControlProperty = 'MCCT';

 
 

-    return wxWriteResource(section, entry, buf, file);
+void wxMacControl::SetReferenceInNativeControl()
+{
+    void * data = this;
+    verify_noerr( SetControlProperty ( m_controlRef ,
+        wxMacCreator,wxMacControlProperty, sizeof(data), &data ) );

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
+wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)

 {
 {

-    wxString buf;
-    buf.Printf(wxT("%d"), value);
-
-    return wxWriteResource(section, entry, buf, file);
+    wxMacControl* ctl = NULL;
+    ByteCount actualSize;
+    if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
+        &actualSize , &ctl ) == noErr )
+    {
+        return ctl;
+    }
+    return NULL;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
+// ============================================================================
+// DataBrowser Wrapper
+// ============================================================================
+//
+// basing on DataBrowserItemIDs
+//
+
+IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl )
+
+pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef itemData )

 {
 {

-    // TODO
-    return FALSE;
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+    if ( ctl != 0 )
+    {
+        ctl->ItemNotification(itemID, message, itemData);
+    }

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
+pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    Boolean changeValue )

 {
 {

-    char *s = NULL;
-    bool succ = wxGetResource(section, entry, (char **)&s, file);
-    if (succ)
+    OSStatus err = errDataBrowserPropertyNotSupported;
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+    if ( ctl != 0 )

     {
     {

-        *value = (float)strtod(s, NULL);
-        delete[] s;
-        return TRUE;
+        err = ctl->GetSetItemData(itemID, property, itemData, changeValue);

     }
     }

-    else return FALSE;
+    return err;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
+pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc(
+    ControlRef browser,
+    DataBrowserItemID itemOneID,
+    DataBrowserItemID itemTwoID,
+    DataBrowserPropertyID sortProperty)

 {
 {

-    char *s = NULL;
-    bool succ = wxGetResource(section, entry, (char **)&s, file);
-    if (succ)
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);
+    if ( ctl != 0 )

     {
     {

-        *value = strtol(s, NULL, 10);
-        delete[] s;
-        return TRUE;
+        return ctl->CompareItems(itemOneID, itemTwoID, sortProperty);

     }
     }

-    else return FALSE;
+    return false;

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
-{
-    char *s = NULL;
-    bool succ = wxGetResource(section, entry, (char **)&s, file);
-    if (succ)
+DataBrowserItemDataUPP gDataBrowserItemDataUPP = NULL;
+DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL;
+DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL;
+
+wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer,
+                                                  const wxPoint& pos,
+                                                  const wxSize& size,
+                                                  long WXUNUSED(style))
+                       : wxMacControl( peer )
+{
+    Rect bounds = wxMacGetBoundsForControl( peer, pos, size );
+    OSStatus err = ::CreateDataBrowserControl(
+        MAC_WXHWND(peer->MacGetTopLevelWindowRef()),
+        &bounds, kDataBrowserListView, &m_controlRef );
+    SetReferenceInNativeControl();
+    verify_noerr( err );
+    if ( gDataBrowserItemCompareUPP == NULL )
+        gDataBrowserItemCompareUPP = NewDataBrowserItemCompareUPP(DataBrowserCompareProc);
+    if ( gDataBrowserItemDataUPP == NULL )
+        gDataBrowserItemDataUPP = NewDataBrowserItemDataUPP(DataBrowserGetSetItemDataProc);
+    if ( gDataBrowserItemNotificationUPP == NULL )

     {
     {

-        *value = (int)strtol(s, NULL, 10);
-        delete[] s;
-        return TRUE;
+        gDataBrowserItemNotificationUPP =
+            (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc);

     }
     }

-    else return FALSE;
+
+    DataBrowserCallbacks callbacks;
+    InitializeDataBrowserCallbacks( &callbacks, kDataBrowserLatestCallbacks );
+
+    callbacks.u.v1.itemDataCallback = gDataBrowserItemDataUPP;
+    callbacks.u.v1.itemCompareCallback = gDataBrowserItemCompareUPP;
+    callbacks.u.v1.itemNotificationCallback = gDataBrowserItemNotificationUPP;
+    SetCallbacks( &callbacks );
+

 }
 }

-#endif // wxUSE_RESOURCES

 
 

-int gs_wxBusyCursorCount = 0;
-extern wxCursor    gMacCurrentCursor ;
-wxCursor        gMacStoredActiveCursor ;
+OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
+    Boolean recurse,
+    DataBrowserItemState state,
+    ItemCount *numItems) const
+{
+    return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems );
+}

 
 

-// Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+OSStatus wxMacDataBrowserControl::GetItems( DataBrowserItemID container,
+    Boolean recurse,
+    DataBrowserItemState state,
+    Handle items) const

 {
 {

-    if (gs_wxBusyCursorCount++ == 0)
-    {
-        gMacStoredActiveCursor = gMacCurrentCursor ;
-        cursor->MacInstall() ;
-    }
-    //else: nothing to do, already set
+    return GetDataBrowserItems( m_controlRef, container, recurse, state, items );

 }
 
 }
 

-// Restore cursor to normal
-void wxEndBusyCursor()
+OSStatus wxMacDataBrowserControl::SetSelectionFlags( DataBrowserSelectionFlags options )

 {
 {

-    wxCHECK_RET( gs_wxBusyCursorCount > 0,
-        wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
+    return SetDataBrowserSelectionFlags( m_controlRef, options );
+}

 
 

-    if (--gs_wxBusyCursorCount == 0)
-    {
-        gMacStoredActiveCursor.MacInstall() ;
-        gMacStoredActiveCursor = wxNullCursor ;
-    }
+OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *columnDesc,
+        DataBrowserTableViewColumnIndex position )
+{
+    return AddDataBrowserListViewColumn( m_controlRef, columnDesc, position );

 }
 
 }
 

-// TRUE if we're between the above two calls
-bool wxIsBusy()
+OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){
+    return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id );
+}
+
+OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position )

 {
 {

-    return (gs_wxBusyCursorCount > 0);
+    DataBrowserTableViewColumnID id;
+    GetColumnIDFromIndex( position, &id );
+    return RemoveDataBrowserTableViewColumn( m_controlRef, id );

 }
 
 }
 

-#endif // wxUSE_GUI
+OSStatus wxMacDataBrowserControl::AutoSizeColumns()
+{
+    return AutoSizeDataBrowserListViewColumns(m_controlRef);
+}

 
 

-#if wxUSE_BASE
+OSStatus wxMacDataBrowserControl::SetHasScrollBars( bool horiz, bool vert )
+{
+    return SetDataBrowserHasScrollBars( m_controlRef, horiz, vert );
+}

 
 

-wxString wxMacFindFolder( short        vol,
-              OSType       folderType,
-              Boolean      createFolder)
+OSStatus wxMacDataBrowserControl::SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )

 {
 {

-    FSRef fsRef ;    
-    wxString strDir ;
+    return SetDataBrowserTableViewHiliteStyle( m_controlRef, hiliteStyle );
+}

 
 

-    if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr)
-        strDir = wxMacFSRefToPath( &fsRef ) + wxFILE_SEP_PATH ;
+OSStatus wxMacDataBrowserControl::SetHeaderButtonHeight(UInt16 height)
+{
+    return SetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );
+}

 
 

-    return strDir ;
+OSStatus wxMacDataBrowserControl::GetHeaderButtonHeight(UInt16 *height)
+{
+    return GetDataBrowserListViewHeaderBtnHeight( m_controlRef, height );

 }
 
 }
 

-#endif // wxUSE_BASE
+OSStatus wxMacDataBrowserControl::SetCallbacks(const DataBrowserCallbacks *callbacks)
+{
+    return SetDataBrowserCallbacks( m_controlRef, callbacks );
+}

 
 

-#if wxUSE_GUI
+OSStatus wxMacDataBrowserControl::UpdateItems(
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty,
+    DataBrowserPropertyID propertyID ) const
+{
+    return UpdateDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty, propertyID );
+}

 
 

-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
+bool wxMacDataBrowserControl::IsItemSelected( DataBrowserItemID item ) const

 {
 {

-    // TODO
-    return FALSE;
+    return IsDataBrowserItemSelected( m_controlRef, item );

 }
 
 }
 

-void wxGetMousePosition( int* x, int* y )
+OSStatus wxMacDataBrowserControl::AddItems(
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty )

 {
 {

-    Point pt ;
+    return AddDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}

 
 

-    GetMouse( &pt ) ;
-    LocalToGlobal( &pt ) ;
-    *x = pt.h ;
-    *y = pt.v ;
-};
+OSStatus wxMacDataBrowserControl::RemoveItems(
+    DataBrowserItemID container,
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserPropertyID preSortProperty )
+{
+    return RemoveDataBrowserItems( m_controlRef, container, numItems, items, preSortProperty );
+}

 
 

-// Return TRUE if we have a colour display
-bool wxColourDisplay()
+OSStatus wxMacDataBrowserControl::RevealItem(
+    DataBrowserItemID item,
+    DataBrowserPropertyID propertyID,
+    DataBrowserRevealOptions options ) const

 {
 {

-    return TRUE;
+    return RevealDataBrowserItem( m_controlRef, item, propertyID, options );

 }
 
 }
 

-// Returns depth of screen
-int wxDisplayDepth()
+OSStatus wxMacDataBrowserControl::SetSelectedItems(
+    UInt32 numItems,
+    const DataBrowserItemID *items,
+    DataBrowserSetOption operation )

 {
 {

-    Rect globRect ;
-    SetRect(&globRect, -32760, -32760, 32760, 32760);
-    GDHandle    theMaxDevice;
+    return SetDataBrowserSelectedItems( m_controlRef, numItems, items, operation );
+}

 
 

-    int theDepth = 8;
-    theMaxDevice = GetMaxDevice(&globRect);
-    if (theMaxDevice != nil)
-        theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+OSStatus wxMacDataBrowserControl::GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const
+{
+    return GetDataBrowserSelectionAnchor( m_controlRef, first, last );
+}

 
 

-    return theDepth ;
+OSStatus wxMacDataBrowserControl::GetItemID( DataBrowserTableViewRowIndex row, DataBrowserItemID * item ) const
+{
+    return GetDataBrowserTableViewItemID( m_controlRef, row, item );

 }
 
 }
 

-// Get size of display
-void wxDisplaySize(int *width, int *height)
+OSStatus wxMacDataBrowserControl::GetItemRow( DataBrowserItemID item, DataBrowserTableViewRowIndex * row ) const

 {
 {

-    BitMap screenBits;
-    GetQDGlobalsScreenBits( &screenBits );
+    return GetDataBrowserTableViewItemRow( m_controlRef, item, row );
+}

 
 

-    if (width != NULL) {
-        *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    }
-    if (height != NULL) {
-        *height = screenBits.bounds.bottom - screenBits.bounds.top ;
-    }
+OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height )
+{
+    return SetDataBrowserTableViewRowHeight( m_controlRef , height );

 }
 
 }
 

-void wxDisplaySizeMM(int *width, int *height)
+OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const

 {
 {

-    wxDisplaySize(width, height);
-    // on mac 72 is fixed (at least now ;-)
-    float cvPt2Mm = 25.4 / 72;
+    return GetDataBrowserTableViewRowHeight( m_controlRef, height );
+}

 
 

-    if (width != NULL) {
-        *width = int( *width * cvPt2Mm );
-    }
-    if (height != NULL) {
-        *height = int( *height * cvPt2Mm );
-    }
+OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height)
+{
+    return SetDataBrowserTableViewItemRowHeight( m_controlRef, item , height );

 }
 
 }
 

-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const

 {
 {

-    Rect r ;
-    GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
-    if ( x )
-        *x = r.left ;
-    if ( y )
-        *y = r.top ;
-    if ( width )
-        *width = r.right - r.left ;
-    if ( height )
-        *height = r.bottom - r.top ;
+    return GetDataBrowserTableViewItemRowHeight( m_controlRef, item , height);

 }
 
 }
 

-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const

 {
 {

-    return wxGenericFindWindowAtPoint(pt);
+    return GetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width );

 }
 
 }
 

-#endif // wxUSE_GUI
+OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width )
+{
+    return SetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width );
+}

 
 

-#if wxUSE_BASE
+OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const
+{
+    return GetDataBrowserTableViewColumnWidth( m_controlRef , width );
+}

 
 

-wxString wxGetOsDescription()
+OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width )

 {
 {

-#ifdef WXWIN_OS_DESCRIPTION
-    // use configure generated description if available
-    return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
-#else
-    return wxT("MacOS") ; //TODO:define further
-#endif
+    return SetDataBrowserTableViewColumnWidth( m_controlRef , width );
+}
+
+OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const
+{
+    return GetDataBrowserTableViewColumnCount( m_controlRef, numColumns);

 }
 
 }
 

-#ifndef __DARWIN__
-wxChar *wxGetUserHome (const wxString& user)
+OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column,
+    DataBrowserTableViewColumnIndex *position) const

 {
 {

-    // TODO
-    return NULL;
+    return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position);

 }
 
 }
 

-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position)

 {
 {

-    if ( path.empty() )
-        return FALSE;
+    return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
+}

 
 

-    wxString p = path ;
-    if (p[0u] == ':' ) {
-      p = wxGetCwd() + p ;
-    }
+OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const
+{
+    return GetDataBrowserScrollPosition( m_controlRef , top , left );
+}

 
 

-    int pos = p.Find(':') ;
-    if ( pos != wxNOT_FOUND ) {
-      p = p.Mid(1,pos) ;
-    }
+OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left )
+{
+    return SetDataBrowserScrollPosition( m_controlRef , top , left );
+}

 
 

-    p = p + wxT(":") ;
+OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const
+{
+    return GetDataBrowserSortProperty( m_controlRef , column );
+}

 
 

-    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 ;
+OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column )
+{
+    return SetDataBrowserSortProperty( m_controlRef , column );

 }
 }

-#endif // !__DARWIN__

 
 

-//---------------------------------------------------------------------------
-// wxMac Specific utility functions
-//---------------------------------------------------------------------------
+OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const
+{
+    return GetDataBrowserSortOrder( m_controlRef , order );
+}

 
 

-void wxMacStringToPascal( const wxString&from , StringPtr to )
+OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order )

 {
 {

-    wxCharBuffer buf = from.mb_str( wxConvLocal ) ;
-    int len = strlen(buf) ;
+    return SetDataBrowserSortOrder( m_controlRef , order );
+}

 
 

-    if ( len > 255 )
-        len = 255 ;
-    to[0] = len ;
-    memcpy( (char*) &to[1] , buf , len ) ;
+OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property,
+    DataBrowserPropertyFlags *flags ) const
+{
+    return GetDataBrowserPropertyFlags( m_controlRef , property , flags );

 }
 
 }
 

-wxString wxMacMakeStringFromPascal( ConstStringPtr from )
+OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property,
+    DataBrowserPropertyFlags flags )

 {
 {

-    return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
+    return SetDataBrowserPropertyFlags( m_controlRef , property , flags );

 }
 
 }
 

+OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property,
+    DataBrowserListViewHeaderDesc *desc ) const
+{
+    return GetDataBrowserListViewHeaderDesc( m_controlRef , property , desc );
+}

 
 

-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 ;
+OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property,
+    DataBrowserListViewHeaderDesc *desc )
+{
+    return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc );

 }
 
 }
 

+OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property ,
+    Boolean expandableRows )
+{
+    return SetDataBrowserListViewDisclosureColumn( m_controlRef, property, expandableRows);
+}

 
 

+// ============================================================================
+// Higher-level Databrowser
+// ============================================================================

 //
 //

-// CFStringRefs (Carbon only)
+// basing on data item objects

 //
 
 //
 

-#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 )
+wxMacDataItem::wxMacDataItem()

 {
 {

-       Release() ;
+    m_data = NULL;

 
 

-       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 ;
+    m_order = 0;
+    m_colId = kTextColumnId; // for compat with existing wx*ListBox impls.

 }
 
 }
 

-wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
+wxMacDataItem::~wxMacDataItem()

 {
 {

-    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 wxMacDataItem::SetOrder( SInt32 order )
+{
+    m_order = order;

 }
 
 }
 

-void wxMacConvertNewlines10To13( char * data )
-{        
-       char * buf = data ;
-    while( (buf=strchr(buf,0x0a)) != NULL )
-    {
-        *buf = 0x0d ;
-        buf++ ;
-    }
+SInt32 wxMacDataItem::GetOrder() const
+{
+    return m_order;

 }
 
 }
 

-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 wxMacDataItem::SetData( void* data)
+{
+    m_data = data;

 }
 
 }
 

-void wxMacConvertNewlines10To13( wxString * data )
-{        
-    size_t len = data->Length() ;
-
-    if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
-        return ;
+void* wxMacDataItem::GetData() const
+{
+    return m_data;
+}

 
 

-    wxString temp(*data) ;
-    wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
-       wxMacConvertNewlines10To13( buf ) ;
+short wxMacDataItem::GetColumn()
+{
+    return m_colId;

 }
 
 }
 

+void wxMacDataItem::SetColumn( short col )
+{
+    m_colId = col;
+}

 
 

-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data ) 
-{        
-       wxChar * buf = data ;
-    while( (buf=wxStrchr(buf,0x0d)) != NULL )
-    {
-        *buf = 0x0a ;
-        buf++ ;
-    }
+void wxMacDataItem::SetLabel( const wxString& str)
+{
+    m_label = str;
+    m_cfLabel = wxCFStringRef( str , wxLocale::GetSystemEncoding());

 }
 
 }
 

-void wxMacConvertNewlines10To13( wxChar * data )
-{        
-       wxChar * buf =  data ;
-    while( (buf=wxStrchr(buf,0x0a)) != NULL )
-    {
-        *buf = 0x0d ;
-        buf++ ;
-    }
+const wxString& wxMacDataItem::GetLabel() const
+{
+    return m_label;

 }
 }

-#endif

 
 

-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
+bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *WXUNUSED(owner) ,
+    const wxMacDataItem* rhs,
+    DataBrowserPropertyID sortProperty) const
+{
+    const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs);
+    bool retval = false;

 
 

+    if ( sortProperty == m_colId ){
+        retval = m_label.CmpNoCase( otherItem->m_label) < 0;
+    }

 
 

-extern ProcessSerialNumber gAppProcess ;
+    else if ( sortProperty == kNumericOrderColumnId )
+        retval = m_order < otherItem->m_order;

 
 

-void wxMacWakeUp()
+    return retval;
+}
+
+OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *WXUNUSED(owner) ,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    bool changeValue )

 {
 {

-    ProcessSerialNumber psn ;
-    Boolean isSame ;
-    psn.highLongOfPSN = 0 ;
-    psn.lowLongOfPSN = kCurrentProcess ;
-    SameProcess( &gAppProcess , &psn , &isSame ) ;
-    if ( isSame )
+    OSStatus err = errDataBrowserPropertyNotSupported;
+    if ( !changeValue )

     {
     {

-#if TARGET_CARBON
-        EventRef dummyEvent ;
-        OSStatus err = MacCreateEvent(nil, 'WXMC', 'WXMC', GetCurrentEventTime(),
-                        kEventAttributeNone, &dummyEvent);
-        if (err == noErr) 
-        {
-            err = PostEventToQueue(GetMainEventQueue(), dummyEvent,
-                                  kEventPriorityHigh);
-        } 
-#else
-        PostEvent( nullEvent , 0 ) ;
-#endif
+        if ( property == m_colId ){
+            err = ::SetDataBrowserItemDataText( itemData, m_cfLabel );
+            err = noErr;
+        }
+        else if ( property == kNumericOrderColumnId ){
+            err = ::SetDataBrowserItemDataValue( itemData, m_order );
+            err = noErr;
+        }
+        else{
+        }

     }
     else
     {
     }
     else
     {

-        WakeUpProcess( &gAppProcess ) ;
+        switch (property)
+        {
+            // no editable props here
+            default:
+                break;
+        }

     }
     }

-}
-
-#endif // wxUSE_BASE

 
 

-#if wxUSE_GUI
-
-
-// ----------------------------------------------------------------------------
-// Carbon Event Support
-// ----------------------------------------------------------------------------
-
-
-OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
-{
-    return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;   
+    return err;

 }
 
 }
 

-OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
+void wxMacDataItem::Notification(wxMacDataItemBrowserControl *WXUNUSED(owner) ,
+    DataBrowserItemNotification WXUNUSED(message),
+    DataBrowserItemDataRef WXUNUSED(itemData) ) const

 {
 {

-    return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;   

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// Control Access Support
-// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl )

 
 

-void wxMacControl::Dispose()
+wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
+    wxMacDataBrowserControl( peer, pos, size, style )

 {
 {

-    ::DisposeControl( m_controlRef ) ;
-    m_controlRef = NULL ;
+    m_suppressSelection = false;
+    m_sortOrder = SortOrder_None;
+    m_clientDataItemsType = wxClientData_None;

 }
 
 }
 

-void wxMacControl::SetReference( SInt32 data ) 
+wxMacDataItem* wxMacDataItemBrowserControl::CreateItem()

 {
 {

-    SetControlReference( m_controlRef , data ) ;
+    return new wxMacDataItem();

 }
 
 }
 

-OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
+wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser)

 {
 {

-    return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;   
+    m_former = browser->SuppressSelection(true);
+    m_browser = browser;

 }
 
 }
 

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

 {
 {

-    return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;   
+    m_browser->SuppressSelection(m_former);

 }
 
 }
 

-OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
+bool  wxMacDataItemBrowserControl::SuppressSelection( bool suppress )

 {
 {

-    return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;   
+    bool former = m_suppressSelection;
+    m_suppressSelection = suppress;
+
+    return former;

 }
 
 }
 

-OSStatus wxMacControl::SendEvent(  EventRef event , OptionBits inOptions ) 
+Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID,
+    DataBrowserItemID itemTwoID,
+    DataBrowserPropertyID sortProperty)

 {
 {

-#if TARGET_API_MAC_OSX
-    return SendEventToEventTargetWithOptions( event, 
-        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );        
-#else
-    #pragma unused(inOptions) 
-    return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
-#endif
+    wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID;
+    wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID;
+    return CompareItems( itemOne , itemTwo , sortProperty );

 }
 
 }
 

-OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions ) 
+Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem*  itemOne,
+    const wxMacDataItem*  itemTwo,
+    DataBrowserPropertyID sortProperty)

 {
 {

-    wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;
-    event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
-    return SendEvent( event , inOptions ) ;     
+    Boolean retval = false;
+    if ( itemOne != NULL )
+        retval = itemOne->IsLessThan( this , itemTwo , sortProperty);
+    return retval;

 }
 
 }
 

-OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  ) 
+OSStatus wxMacDataItemBrowserControl::GetSetItemData(
+    DataBrowserItemID itemID,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    Boolean changeValue )

 {
 {

-    HICommand command ;
-    memset( &command, 0 , sizeof(command) ) ;
-    command.commandID = commandID ;
-    return SendHICommand( command , inOptions ) ;
+    wxMacDataItem* item = (wxMacDataItem*) itemID;
+    return GetSetItemData(item, property, itemData , changeValue );

 }
 
 }
 

-void wxMacControl::Flash( ControlPartCode part , UInt32 ticks ) 
+OSStatus wxMacDataItemBrowserControl::GetSetItemData(
+    wxMacDataItem* item,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    Boolean changeValue )

 {
 {

-    HiliteControl( m_controlRef , part ) ;
-    unsigned long finalTicks ;
-    Delay( ticks , &finalTicks ) ;
-    HiliteControl( m_controlRef , kControlNoPart ) ;
-}
+    OSStatus err = errDataBrowserPropertyNotSupported;
+    switch( property )
+    {
+        case kDataBrowserContainerIsClosableProperty :
+        case kDataBrowserContainerIsSortableProperty :
+        case kDataBrowserContainerIsOpenableProperty :
+            // right now default behaviour on these
+            break;
+        default :
+
+            if ( item != NULL ){
+                err = item->GetSetData( this, property , itemData , changeValue );
+            }
+            break;

 
 

-SInt32 wxMacControl::GetValue() const
-{ 
-    return ::GetControl32BitValue( m_controlRef ) ; 
+    }
+    return err;

 }
 
 }
 

-SInt32 wxMacControl::GetMaximum() const
-{ 
-    return ::GetControl32BitMaximum( m_controlRef ) ; 
+void wxMacDataItemBrowserControl::ItemNotification(
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef itemData)
+{
+    wxMacDataItem* item = (wxMacDataItem*) itemID;
+    ItemNotification( item , message, itemData);

 }
 
 }
 

-SInt32 wxMacControl::GetMinimum() const
-{ 
-    return ::GetControl32BitMinimum( m_controlRef ) ; 
+void wxMacDataItemBrowserControl::ItemNotification(
+    const wxMacDataItem* item,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef itemData)
+{
+    if (item != NULL)
+        item->Notification( this, message, itemData);

 }
 
 }
 

-void wxMacControl::SetValue( SInt32 v ) 
-{ 
-    ::SetControl32BitValue( m_controlRef , v ) ; 
+unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container,
+        bool recurse , DataBrowserItemState state) const
+{
+    ItemCount numItems = 0;
+    verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container,
+        recurse, state, &numItems ) );
+    return numItems;

 }
 
 }
 

-void wxMacControl::SetMinimum( SInt32 v ) 
-{ 
-    ::SetControl32BitMinimum( m_controlRef , v ) ; 
-}
+unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container,
+        bool recurse ) const
+{
+    return GetItemCount( container, recurse, kDataBrowserItemIsSelected );

 
 

-void wxMacControl::SetMaximum( SInt32 v ) 
-{ 
-    ::SetControl32BitMaximum( m_controlRef , v ) ;

 }
 
 }
 

-void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container,
+    bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const

 {
 {

-    ::SetControl32BitMinimum( m_controlRef , minimum ) ;
-    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
-    ::SetControl32BitValue( m_controlRef , value ) ;
+    Handle handle = NewHandle(0);
+    verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container ,
+        recurse , state, handle) );
+
+    int itemCount = GetHandleSize(handle)/sizeof(DataBrowserItemID);
+    HLock( handle );
+    wxMacDataItemPtr* itemsArray = (wxMacDataItemPtr*) *handle;
+    for ( int i = 0; i < itemCount; ++i)
+    {
+        items.Add(itemsArray[i]);
+    }
+    HUnlock( handle );
+    DisposeHandle( handle );

 }
 
 }
 

-OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart ) 
+unsigned int wxMacDataItemBrowserControl::GetLineFromItem(const wxMacDataItem* item) const

 {
 {

-    return SetKeyboardFocus(  GetControlOwner( m_controlRef )  , 
-        m_controlRef , focusPart ) ;
+    DataBrowserTableViewRowIndex row;
+    OSStatus err = GetItemRow( (DataBrowserItemID) item , &row);
+    wxCHECK( err == noErr, (unsigned)-1 );
+    return row;

 }
 
 }
 

-bool wxMacControl::HasFocus() const 
+wxMacDataItem*  wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) const

 {
 {

-    ControlRef control ;
-    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
-    return control == m_controlRef ;
+    DataBrowserItemID id;
+    OSStatus err =  GetItemID( (DataBrowserTableViewRowIndex) n , &id);
+    wxCHECK( err == noErr, NULL );
+    return (wxMacDataItem*) id;

 }
 
 }
 

-bool wxMacControl::NeedsFocusRect() const 
+void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container,
+        const wxMacDataItem *item , DataBrowserPropertyID property) const

 {
 {

-    return false ;
+    verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1,
+        (DataBrowserItemID*) &item, kDataBrowserItemNoProperty /* notSorted */, property ) );

 }
 
 }
 

-void wxMacControl::VisibilityChanged(bool shown) 
+void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container,
+        wxArrayMacDataItemPtr &itemArray , DataBrowserPropertyID property) const

 {
 {

+    unsigned int noItems = itemArray.GetCount();
+    DataBrowserItemID *items = new DataBrowserItemID[noItems];
+    for ( unsigned int i = 0; i < noItems; ++i )
+        items[i] = (DataBrowserItemID) itemArray[i];
+
+    verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems,
+        items, kDataBrowserItemNoProperty /* notSorted */, property ) );
+    delete [] items;

 }
 
 }
 

-void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) 
+void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,
+                                            const wxString& title, SInt16 just, int defaultWidth)

 {
 {

-    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 ;
-       }
+    DataBrowserListViewColumnDesc columnDesc;
+    columnDesc.headerBtnDesc.titleOffset = 0;
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;

 
 

-    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 ;
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;

 
 

-    
-    // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
-    // won't get grayed out by the system anymore
-    
-    if ( foreground != *wxBLACK )
-    {
-        fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
-        fontStyle.flags |= kControlUseForeColorMask ;
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly;
+    columnDesc.headerBtnDesc.btnFontStyle.just = just;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+
+    // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is
+    // defined for other modes?
+    wxFontEncoding enc;
+    if ( m_font.Ok() )
+        enc = m_font.GetEncoding();
+    else
+        enc = wxLocale::GetSystemEncoding();
+    wxCFStringRef cfTitle( title, enc );
+    columnDesc.headerBtnDesc.titleString = cfTitle;
+
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 30000;
+
+    columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
+    columnDesc.propertyDesc.propertyType = colType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
+
+    verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
+
+    if (defaultWidth > 0){
+        SetColumnWidth(colId, defaultWidth);

     }
     }

-       
-       ::SetControlFontStyle( m_controlRef , &fontStyle );
-}

 
 

-void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) ) 
-{
-    // TODO 
-    // setting up a color proc is not recommended anymore

 }
 
 }
 

-void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width)

 {
 {

-    ::SetControl32BitMinimum( m_controlRef , minimum ) ;
-    ::SetControl32BitMaximum( m_controlRef , maximum ) ; 
+    DataBrowserPropertyID id;
+    GetColumnIDFromIndex(colId, &id);
+    verify_noerr( wxMacDataBrowserControl::SetColumnWidth(id, width));

 }
 
 }
 

-short wxMacControl::HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers ) 
+int wxMacDataItemBrowserControl::GetColumnWidth(int colId)

 {
 {

-    return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ;
+    DataBrowserPropertyID id;
+    GetColumnIDFromIndex(colId, &id);
+    UInt16 result;
+    verify_noerr( wxMacDataBrowserControl::GetColumnWidth(id, &result));
+    return result;

 }
 
 }
 

-void wxMacControl::SetActionProc( ControlActionUPP   actionProc )
+void wxMacDataItemBrowserControl::AddItem(wxMacDataItem *container, wxMacDataItem *item)

 {
 {

-    SetControlAction( m_controlRef , actionProc ) ;
+    verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1,
+        (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ) );

 }
 
 }
 

-void wxMacControl::SetViewSize( SInt32 viewSize )
+void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray )

 {
 {

-    SetControlViewSize(m_controlRef , viewSize ) ;
-}
+    unsigned int noItems = itemArray.GetCount();
+    DataBrowserItemID *items = new DataBrowserItemID[noItems];
+    for ( unsigned int i = 0; i < noItems; ++i )
+        items[i] = (DataBrowserItemID) itemArray[i];

 
 

-SInt32 wxMacControl::GetViewSize() const
-{
-    return GetControlViewSize( m_controlRef ) ;
+    verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems,
+        (DataBrowserItemID*) items, kDataBrowserItemNoProperty ) );
+    delete [] items;

 }
 
 }
 

-bool wxMacControl::IsVisible() const 
+void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item)

 {
 {

-    return IsControlVisible( m_controlRef ) ;
+    OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,
+        (DataBrowserItemID*) &item, kDataBrowserItemNoProperty );
+    verify_noerr( err );

 }
 
 }
 

-void wxMacControl::SetVisibility( bool visible , bool redraw ) 
+void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray)

 {
 {

-    SetControlVisibility( m_controlRef , visible , redraw ) ;
+    unsigned int noItems = itemArray.GetCount();
+    DataBrowserItemID *items = new DataBrowserItemID[noItems];
+    for ( unsigned int i = 0; i < noItems; ++i )
+        items[i] = (DataBrowserItemID) itemArray[i];
+
+    OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,
+        (DataBrowserItemID*) items, kDataBrowserItemNoProperty );
+    verify_noerr( err );
+    delete [] items;

 }
 
 }
 

-bool wxMacControl::IsEnabled() const 
+void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container)

 {
 {

-#if TARGET_API_MAC_OSX
-    return IsControlEnabled( m_controlRef ) ;
-#else
-    return IsControlActive( m_controlRef ) ;
-#endif
+    OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 0 , NULL , kDataBrowserItemNoProperty );
+    verify_noerr( err );

 }
 
 }
 

-bool wxMacControl::IsActive() const 
+void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option)

 {
 {

-    return IsControlActive( m_controlRef ) ;
+    verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 1, (DataBrowserItemID*) &item, option ));

 }
 
 }
 

-void wxMacControl::Enable( bool enable ) 
+void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option)

 {
 {

-#if TARGET_API_MAC_OSX
-    if ( enable )
-        EnableControl( m_controlRef ) ;
-    else
-        DisableControl( m_controlRef ) ;
-#else
-    if ( enable )
-        ActivateControl( m_controlRef ) ;
-    else
-        DeactivateControl( m_controlRef ) ;
-#endif
+    verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 0 , NULL , option ));

 }
 
 }
 

-void wxMacControl::SetDrawingEnabled( bool enable ) 
+void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option)

 {
 {

-#if TARGET_API_MAC_OSX
-    HIViewSetDrawingEnabled( m_controlRef , enable ) ;
-#endif
+    unsigned int noItems = itemArray.GetCount();
+    DataBrowserItemID *items = new DataBrowserItemID[noItems];
+    for ( unsigned int i = 0; i < noItems; ++i )
+        items[i] = (DataBrowserItemID) itemArray[i];
+
+    verify_noerr(wxMacDataBrowserControl::SetSelectedItems( noItems, (DataBrowserItemID*) items, option ));
+    delete [] items;

 }
 
 }
 

-bool wxMacControl::GetNeedsDisplay() const 
+Boolean wxMacDataItemBrowserControl::IsItemSelected( const wxMacDataItem* item) const

 {
 {

-#if TARGET_API_MAC_OSX
-    return HIViewGetNeedsDisplay( m_controlRef ) ;
-#else
-    return false ;
-#endif
+    return wxMacDataBrowserControl::IsItemSelected( (DataBrowserItemID) item);

 }
 
 }
 

-void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where ) 
+void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options)

 {
 {

-#if TARGET_API_MAC_OSX
-    if ( where != NULL )
-        HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ;
-    else
-        HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ;
-#endif
+    verify_noerr(wxMacDataBrowserControl::RevealItem( (DataBrowserItemID) item, kDataBrowserNoItem , options ) );

 }
 
 }
 

-void  wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) 
+void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const

 {
 {

-#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
+    verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) );

 }
 
 }
 

-void wxMacControl::SetRect( Rect *r ) 
+wxClientDataType wxMacDataItemBrowserControl::GetClientDataType() const

 {
 {

-#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
-
+     return m_clientDataItemsType;

 }
 }

-
-void wxMacControl::GetRect( Rect *r ) 
+void wxMacDataItemBrowserControl::SetClientDataType(wxClientDataType clientDataItemsType)

 {
 {

-    GetControlBounds( m_controlRef , r ) ;
+    m_clientDataItemsType = clientDataItemsType;

 }
 
 }
 

-void wxMacControl::GetRectInWindowCoords( Rect *r ) 
+unsigned int wxMacDataItemBrowserControl::MacGetCount() const

 {
 {

-    UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ;
+    return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState);

 }
 
 }
 

-void wxMacControl::GetBestRect( Rect *r ) 
+void wxMacDataItemBrowserControl::MacDelete( unsigned int n )

 {
 {

-    short   baselineoffset ;
-    GetBestControlRect( m_controlRef , r , &baselineoffset ) ;
+    wxMacDataItem* item = (wxMacDataItem*)GetItemFromLine( n );
+    RemoveItem( wxMacDataBrowserRootContainer, item );

 }
 
 }
 

-void wxMacControl::SetTitle( const wxString &title ) 
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n,
+                                             const wxArrayStringsAdapter& items,
+                                             int column )

 {
 {

-    wxFontEncoding encoding;
+    size_t itemsCount = items.GetCount();
+    if ( itemsCount == 0 )
+        return;

 
 

-    if ( m_font.Ok() )
-        encoding = m_font.GetEncoding();
-    else
-        encoding = wxFont::GetDefaultEncoding();
-    
-    UMASetControlTitle(  m_controlRef , title , encoding ) ;
+    SInt32 frontLineOrder = 0;
+
+    if ( m_sortOrder == SortOrder_None )
+    {
+        // increase the order of the lines to be shifted
+        unsigned int lines = MacGetCount();
+        for ( unsigned int i = n; i < lines; ++i)
+        {
+            wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
+            iter->SetOrder( iter->GetOrder() + itemsCount );
+        }
+        if ( n > 0 )
+        {
+            wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
+            frontLineOrder = iter->GetOrder();
+        }
+    }
+
+    wxArrayMacDataItemPtr ids;
+    ids.SetCount( itemsCount );
+
+    for ( unsigned int i = 0; i < itemsCount; ++i )
+    {
+        wxMacDataItem* item = CreateItem();
+        item->SetLabel( items[i]);
+        if ( column != -1 )
+            item->SetColumn( kMinColumnId + column );
+
+        if ( m_sortOrder == SortOrder_None )
+            item->SetOrder( frontLineOrder + 1 + i );
+
+        ids[i] = item;
+    }
+
+    AddItems( wxMacDataBrowserRootContainer, ids );

 }
 
 }
 

-void wxMacControl::GetFeatures( UInt32 * features )
+int wxMacDataItemBrowserControl::MacAppend( const wxString& text)

 {
 {

-    GetControlFeatures( m_controlRef , features ) ;
+    wxMacDataItem* item = CreateItem();
+    item->SetLabel( text );
+    if ( m_sortOrder == SortOrder_None )
+    {
+        unsigned int lines = MacGetCount();
+        if ( lines == 0 )
+            item->SetOrder( 1 );
+        else
+        {
+            wxMacDataItem* frontItem = (wxMacDataItem*) GetItemFromLine(lines-1);
+            item->SetOrder( frontItem->GetOrder() + 1 );
+        }
+    }
+    AddItem( wxMacDataBrowserRootContainer, item );
+
+    return GetLineFromItem(item);

 }
 
 }
 

-OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) 
+void wxMacDataItemBrowserControl::MacClear()

 {
 {

-    return GetControlRegion( m_controlRef , partCode , region ) ;
+    wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+    RemoveAllItems(wxMacDataBrowserRootContainer);

 }
 
 }
 

-OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other ) 
+void wxMacDataItemBrowserControl::MacDeselectAll()

 {
 {

-#if TARGET_API_MAC_OSX
-    return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow, 
-       (other != NULL) ? other->m_controlRef : NULL) ;
-#else
-    return 0 ;
-#endif
+    wxMacDataItemBrowserSelectionSuppressor suppressor(this);
+    SetSelectedAllItems( kDataBrowserItemsRemove );

 }
 
 }
 

-
-#if TARGET_API_MAC_OSX
-// SetNeedsDisplay would not invalidate the children
-static void InvalidateControlAndChildren( HIViewRef control )
+void wxMacDataItemBrowserControl::MacSetSelection( unsigned int n, bool select, bool multi )

 {
 {

-    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") ) ;
+    wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+    wxMacDataItemBrowserSelectionSuppressor suppressor(this);

 
 

-    for ( UInt16 i = childrenCount ; i >=1  ; --i )
+    if ( IsItemSelected( item ) != select )

     {
     {

-        HIViewRef child ;
-        err = GetIndexedSubControl( control , i , & child ) ;
-        if ( err == errControlIsNotEmbedder )
-            return ;
-        InvalidateControlAndChildren( child ) ;
+        if ( select )
+            SetSelectedItem( item, multi ? kDataBrowserItemsAdd : kDataBrowserItemsAssign );
+        else
+            SetSelectedItem( item, kDataBrowserItemsRemove );

     }
     }

+
+    MacScrollTo( n );

 }
 }

-#endif

 
 

-void wxMacControl::InvalidateWithChildren() 
+bool wxMacDataItemBrowserControl::MacIsSelected( unsigned int n ) const

 {
 {

-#if TARGET_API_MAC_OSX
-    InvalidateControlAndChildren( m_controlRef ) ;
-#endif
+    wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n);
+    return IsItemSelected( item );

 }
 
 }
 

-void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy ) 
+int wxMacDataItemBrowserControl::MacGetSelection() const

 {
 {

-#if TARGET_API_MAC_OSX
-    HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ;
-    HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ;
-#endif
+    wxMacDataItemPtr first, last;
+    GetSelectionAnchor( &first, &last );
+
+    if ( first != NULL )
+    {
+        return GetLineFromItem( first );
+    }
+
+    return -1;

 }
 
 }
 

+int wxMacDataItemBrowserControl::MacGetSelections( wxArrayInt& aSelections ) const
+{
+    aSelections.Empty();
+    wxArrayMacDataItemPtr selectedItems;
+    GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems);

 
 

-// SetNeedsDisplay would not invalidate the children
+    int count = selectedItems.GetCount();

 
 

-//
-// Databrowser
-//
+    for ( int i = 0; i < count; ++i)
+    {
+        aSelections.Add(GetLineFromItem(selectedItems[i]));
+    }

 
 

-OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options ) 
-{
-    return SetDataBrowserSelectionFlags( m_controlRef , options ) ;
+    return count;

 }
 
 }
 

-OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
-        DataBrowserTableViewColumnIndex position ) 
+void wxMacDataItemBrowserControl::MacSetString( unsigned int n, const wxString& text )

 {
 {

-    return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ;
+    // as we don't store the strings we only have to issue a redraw
+    wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+    item->SetLabel( text );
+    UpdateItem( wxMacDataBrowserRootContainer, item , kTextColumnId );

 }
 
 }
 

-OSStatus wxMacControl::AutoSizeListViewColumns()
+wxString wxMacDataItemBrowserControl::MacGetString( unsigned int n ) const

 {
 {

-    return AutoSizeDataBrowserListViewColumns(m_controlRef) ;
+    wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+    return item->GetLabel();

 }
 
 }
 

-OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert ) 
+void wxMacDataItemBrowserControl::MacSetClientData( unsigned int n, void * data)

 {
 {

-    return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ;
+    wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n);
+    item->SetData( data );
+    // not displayed, therefore no Update infos to DataBrowser

 }
 
 }
 

-OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle )
+void * wxMacDataItemBrowserControl::MacGetClientData( unsigned int n) const

 {
 {

-    return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ;
+    wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
+    return item->GetData();

 }
 
 }
 

-OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height) 
+void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )

 {
 {

-    return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ;
-}
+    UInt32 top , left ;
+    GetScrollPosition( &top , &left ) ;
+    wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );

 
 

-OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks *  callbacks) 
-{
-    return SetDataBrowserCallbacks( m_controlRef , callbacks ) ;
-}
+    // there is a bug in RevealItem that leads to situations
+    // in large lists, where the item does not get scrolled
+    // into sight, so we do a pre-scroll if necessary
+    UInt16 height ;
+    GetRowHeight( (DataBrowserItemID) item , &height ) ;
+    UInt32 linetop = n * ((UInt32) height );
+    UInt32 linebottom = linetop + height;
+    Rect rect ;
+    GetRect( &rect );

 
 

-OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems,
-        const DataBrowserItemID* items,                
-        DataBrowserPropertyID preSortProperty,
-        DataBrowserPropertyID propertyID ) 
-{
-    return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ;
+    if ( linetop < top || linebottom > (top + rect.bottom - rect.top ) )
+        SetScrollPosition( wxMax( n-2, 0 ) * ((UInt32)height) , left ) ;
+
+    RevealItem( item , kDataBrowserRevealWithoutSelecting );

 }
 
 }
 

-bool wxMacControl::IsItemSelected( DataBrowserItemID item ) 
+
+
+//
+// Tab Control
+//
+
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )

 {
 {

-    return IsDataBrowserItemSelected( m_controlRef , item ) ;
+    return ::SetTabEnabled( m_controlRef , tabNo , enable );

 }
 
 }
 

-OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,                
-            DataBrowserPropertyID preSortProperty ) 
+#endif
+
+//
+// Quartz Support
+//
+
+/*
+    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()

 {
 {

-    return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+    static wxCFRef<CGColorSpaceRef> genericRGBColorSpace;
+
+    if (genericRGBColorSpace == NULL)
+    {
+        genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );
+    }
+
+    return genericRGBColorSpace;

 }
 
 }
 

-OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID* items,                
-            DataBrowserPropertyID preSortProperty ) 
+CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush )

 {
 {

-    return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ;
+    CGColorRef color ;
+    HIThemeBrushCreateCGColor( brush, &color );
+    return color;

 }
 
 }
 

-OSStatus wxMacControl::RevealItem( DataBrowserItemID item,
-            DataBrowserPropertyID propertyID,
-            DataBrowserRevealOptions options ) 
+#if wxMAC_USE_QUICKDRAW
+
+static inline void PointFromHIPoint(const HIPoint& p, Point *pt)

 {
 {

-    return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ;
+    pt->h = wx_static_cast(short, p.x);
+    pt->v = wx_static_cast(short, p.y);

 }
 
 }
 

-OSStatus wxMacControl::SetSelectedItems(UInt32 numItems,
-            const DataBrowserItemID * items,
-            DataBrowserSetOption operation ) 
+void wxMacGlobalToLocal( WindowRef window , Point*pt )

 {
 {

-    return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ;
+    HIPoint p = CGPointMake( pt->h, pt->v );
+    HIViewRef contentView ;
+    // TODO check toolbar offset
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+    HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
+    PointFromHIPoint(p, pt);

 }
 
 }
 

-//
-// Tab Control
-//
- 
-OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) 
+void wxMacLocalToGlobal( WindowRef window , Point*pt )

 {
 {

-    return ::SetTabEnabled( m_controlRef , tabNo , enable ) ;
+    HIPoint p = CGPointMake( pt->h, pt->v );
+    HIViewRef contentView ;
+    // TODO check toolbar offset
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+    HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
+    PointFromHIPoint(p, pt);

 }
 }

- 
+
+#endif // wxMAC_USE_QUICKDRAW
+

 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI
 

+#if wxUSE_BASE
+
+#endif