Use new function GetItemLabel

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 2bcb67b33c7aef6deb12b7929a6dbfe18cc088af..55848f5799b23fec313a5f5d39c645d5b60689ad 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -57,8 +57,11 @@
     #include <TextCommon.h>
     #include <TextEncodingConverter.h>
 #endif
     #include <TextCommon.h>
     #include <TextEncodingConverter.h>
 #endif

+
+#include "wx/mac/private/timer.h"

 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI
 

+#include "wx/evtloop.h"

 #include "wx/mac/private.h"
 
 #if defined(__MWERKS__) && wxUSE_UNICODE
 #include "wx/mac/private.h"
 
 #if defined(__MWERKS__) && wxUSE_UNICODE


@@ -72,7 +75,7 @@
 // our OS version is the same in non GUI and GUI cases
 wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 // our OS version is the same in non GUI and GUI cases
 wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-    long theSystem;
+    SInt32 theSystem;

     Gestalt(gestaltSystemVersion, &theSystem);
 
     if ( majorVsn != NULL )
     Gestalt(gestaltSystemVersion, &theSystem);
 
     if ( majorVsn != NULL )


@@ -303,7 +306,13 @@ WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
 }
 
 // set the env var name to the given value, return true on success
 }
 
 // set the env var name to the given value, return true on success

-WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxString& value)
+{
+    // TODO : under classic there is no environement support, under X yes
+    return false;
+}
+
+WXDLLEXPORT bool wxUnsetEnv(const wxString& var)

 {
     // TODO : under classic there is no environement support, under X yes
     return false;
 {
     // TODO : under classic there is no environement support, under X yes
     return false;


@@ -360,7 +369,9 @@ void wxFlushEvents()
 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {

+#ifndef __LP64__

     SysBeep(30);
     SysBeep(30);

+#endif

 }
 
 
 }
 
 


@@ -376,84 +387,16 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
     return wxPORT_MAC;
 }
 
     return wxPORT_MAC;
 }
 

-// 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)
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()

 {
 {

-    // TODO
-    return false;
+    return new wxEventLoop;

 }
 
 }
 

-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)

 {
 {

-    wxString buf;
-    buf.Printf(wxT("%.4f"), value);
-
-    return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
-{
-    wxString buf;
-    buf.Printf(wxT("%ld"), value);
-
-    return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
-{
-    wxString buf;
-    buf.Printf(wxT("%d"), value);
-
-    return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
-{
-    // TODO
-    return false;
-}
-
-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
-{
-    char *s = NULL;
-    bool succ = wxGetResource(section, entry, (char **)&s, file);
-    if (succ)
-    {
-        *value = (float)strtod(s, NULL);
-        delete[] s;
-    }
-
-    return succ;
+    return new wxCarbonTimerImpl(timer);

 }
 
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
-{
-    char *s = NULL;
-    bool succ = wxGetResource(section, entry, (char **)&s, file);
-    if (succ)
-    {
-        *value = strtol(s, NULL, 10);
-        delete[] s;
-    }
-
-    return succ;
-}
-
-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)
-    {
-        *value = (int)strtol(s, NULL, 10);
-        delete[] s;
-    }
-
-    return succ;
-}
-#endif // wxUSE_RESOURCES
-

 int gs_wxBusyCursorCount = 0;
 extern wxCursor    gMacCurrentCursor;
 wxCursor        gMacStoredActiveCursor;
 int gs_wxBusyCursorCount = 0;
 extern wxCursor    gMacCurrentCursor;
 wxCursor        gMacStoredActiveCursor;


@@ -529,9 +472,12 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt;
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt;

-
+#if wxMAC_USE_CORE_GRAPHICS
+    GetGlobalMouse(&pt);
+#else

     GetMouse( &pt );
     LocalToGlobal( &pt );
     GetMouse( &pt );
     LocalToGlobal( &pt );

+#endif

     *x = pt.h;
     *y = pt.v;
 };
     *x = pt.h;
     *y = pt.v;
 };


@@ -545,21 +491,32 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

+    int theDepth = 8;
+#if wxMAC_USE_CORE_GRAPHICS
+    theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID());
+#else

     Rect globRect;
     SetRect(&globRect, -32760, -32760, 32760, 32760);
     GDHandle    theMaxDevice;
 
     Rect globRect;
     SetRect(&globRect, -32760, -32760, 32760, 32760);
     GDHandle    theMaxDevice;
 

-    int theDepth = 8;

     theMaxDevice = GetMaxDevice(&globRect);
     if (theMaxDevice != NULL)
         theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
     theMaxDevice = GetMaxDevice(&globRect);
     if (theMaxDevice != NULL)
         theDepth = (**(**theMaxDevice).gdPMap).pixelSize;

-
+#endif

     return theDepth;
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
     return theDepth;
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

+#if wxMAC_USE_CORE_GRAPHICS
+    // TODO adapt for multi-displays
+    CGRect bounds = CGDisplayBounds(CGMainDisplayID());
+    if ( width )
+        *width = (int)bounds.size.width ;
+    if ( height )
+        *height = (int)bounds.size.height;
+#else

     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
 
     BitMap screenBits;
     GetQDGlobalsScreenBits( &screenBits );
 


@@ -568,6 +525,7 @@ void wxDisplaySize(int *width, int *height)
 
     if (height != NULL)
         *height = screenBits.bounds.bottom - screenBits.bounds.top;
 
     if (height != NULL)
         *height = screenBits.bounds.bottom - screenBits.bounds.top;

+#endif

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


@@ -585,8 +543,20 @@ void wxDisplaySizeMM(int *width, int *height)
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+        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

     Rect r;
     Rect r;

-

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


@@ -596,6 +566,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.right - r.left;
     if ( height )
         *height = r.bottom - r.top;
         *width = r.right - r.left;
     if ( height )
         *height = r.bottom - r.top;

+#endif

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)


@@ -791,6 +762,13 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
 // Control Access Support
 // ----------------------------------------------------------------------------
 
 // Control Access Support
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject )
+
+wxMacControl::wxMacControl() 
+{
+    Init();
+}
+

 wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
 {
     Init();
 wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
 {
     Init();


@@ -826,16 +804,18 @@ void wxMacControl::Init()
 
 void wxMacControl::Dispose()
 {
 
 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") );
 
     wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
 

-    CFIndex count = CFGetRetainCount( m_controlRef ) ;
-    wxASSERT_MSG( count == 1 , wxT("Reference Count of native control was not 1 in Dispose") );
-
-    ::DisposeControl( m_controlRef );
+    // 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;
 }
 
     m_controlRef = NULL;
 }
 

-void wxMacControl::SetReference( SInt32 data )
+void wxMacControl::SetReference( URefCon data )

 {
     SetControlReference( m_controlRef , data );
 }
 {
     SetControlReference( m_controlRef , data );
 }


@@ -1029,7 +1009,11 @@ void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
 
 short wxMacControl::HandleKey( SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers )
 {
 
 short wxMacControl::HandleKey( SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers )
 {

+#ifndef __LP64__

     return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );
     return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );

+#else
+    return 0;
+#endif

 }
 
 void wxMacControl::SetActionProc( ControlActionUPP   actionProc )
 }
 
 void wxMacControl::SetActionProc( ControlActionUPP   actionProc )


@@ -1237,7 +1221,7 @@ void wxMacControl::SetReferenceInNativeControl()
 wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
 {
     wxMacControl* ctl = NULL;
 wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
 {
     wxMacControl* ctl = NULL;

-    UInt32 actualSize;
+    ByteCount actualSize;

     if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
         &actualSize , &ctl ) == noErr )
     {
     if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
         &actualSize , &ctl ) == noErr )
     {


@@ -1253,13 +1237,15 @@ wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
 // basing on DataBrowserItemIDs
 //
 
 // basing on DataBrowserItemIDs
 //
 

+IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl )
+

 pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
     ControlRef browser,
     DataBrowserItemID itemID,
     DataBrowserItemNotification message,
     DataBrowserItemDataRef itemData )
 {
 pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc(
     ControlRef browser,
     DataBrowserItemID itemID,
     DataBrowserItemNotification message,
     DataBrowserItemDataRef itemData )
 {

-    wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);

     if ( ctl != 0 )
     {
         ctl->ItemNotification(itemID, message, itemData);
     if ( ctl != 0 )
     {
         ctl->ItemNotification(itemID, message, itemData);


@@ -1274,7 +1260,7 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc(
     Boolean changeValue )
 {
     OSStatus err = errDataBrowserPropertyNotSupported;
     Boolean changeValue )
 {
     OSStatus err = errDataBrowserPropertyNotSupported;

-    wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);

     if ( ctl != 0 )
     {
         err = ctl->GetSetItemData(itemID, property, itemData, changeValue);
     if ( ctl != 0 )
     {
         err = ctl->GetSetItemData(itemID, property, itemData, changeValue);


@@ -1288,7 +1274,7 @@ pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc(
     DataBrowserItemID itemTwoID,
     DataBrowserPropertyID sortProperty)
 {
     DataBrowserItemID itemTwoID,
     DataBrowserPropertyID sortProperty)
 {

-    wxMacDataBrowserControl* ctl = dynamic_cast<wxMacDataBrowserControl*>( wxMacControl::GetReferenceFromNativeControl( browser ) );
+    wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl);

     if ( ctl != 0 )
     {
         return ctl->CompareItems(itemOneID, itemTwoID, sortProperty);
     if ( ctl != 0 )
     {
         return ctl->CompareItems(itemOneID, itemTwoID, sortProperty);


@@ -1335,7 +1321,7 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint&
 OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
     Boolean recurse,
     DataBrowserItemState state,
 OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container,
     Boolean recurse,
     DataBrowserItemState state,

-    UInt32 *numItems) const
+    ItemCount *numItems) const

 {
     return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems );
 }
 {
     return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems );
 }


@@ -1360,12 +1346,12 @@ OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *colu
 }
 
 OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){
 }
 
 OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){

-    return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id ); 
+    return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id );

 }
 
 OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position )
 {
 }
 
 OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position )
 {

-    DataBrowserTableViewColumnID id; 
+    DataBrowserTableViewColumnID id;

     GetColumnIDFromIndex( position, &id );
     return RemoveDataBrowserTableViewColumn( m_controlRef, id );
 }
     GetColumnIDFromIndex( position, &id );
     return RemoveDataBrowserTableViewColumn( m_controlRef, id );
 }


@@ -1510,12 +1496,12 @@ OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const
 }
 
 OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column,
 }
 
 OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column,

-    UInt32 *position) const
+    DataBrowserTableViewColumnIndex *position) const

 {
     return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
 }
 
 {
     return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
 }
 

-OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position)
+OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position)

 {
     return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
 }
 {
     return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position);
 }


@@ -1590,6 +1576,7 @@ OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID pro
 wxMacDataItem::wxMacDataItem()
 {
     m_data = NULL;
 wxMacDataItem::wxMacDataItem()
 {
     m_data = NULL;

+

     m_order = 0;
     m_colId = kTextColumnId; // for compat with existing wx*ListBox impls.
 }
     m_order = 0;
     m_colId = kTextColumnId; // for compat with existing wx*ListBox impls.
 }


@@ -1626,7 +1613,7 @@ short wxMacDataItem::GetColumn()
 void wxMacDataItem::SetColumn( short col )
 {
     m_colId = col;
 void wxMacDataItem::SetColumn( short col )
 {
     m_colId = col;

-} 
+}

 
 void wxMacDataItem::SetLabel( const wxString& str)
 {
 
 void wxMacDataItem::SetLabel( const wxString& str)
 {


@@ -1643,13 +1630,13 @@ bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
     const wxMacDataItem* rhs,
     DataBrowserPropertyID sortProperty) const
 {
     const wxMacDataItem* rhs,
     DataBrowserPropertyID sortProperty) const
 {

-    const wxMacDataItem* otherItem = dynamic_cast<const wxMacDataItem*>(rhs);
+    const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs);

     bool retval = false;
     bool retval = false;

-    
+

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

-    
+

     else if ( sortProperty == kNumericOrderColumnId )
         retval = m_order < otherItem->m_order;
 
     else if ( sortProperty == kNumericOrderColumnId )
         retval = m_order < otherItem->m_order;
 


@@ -1694,6 +1681,7 @@ void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner ,
 {
 }
 
 {
 }
 

+IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl )

 
 wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
     wxMacDataBrowserControl( peer, pos, size, style )
 
 wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) :
     wxMacDataBrowserControl( peer, pos, size, style )


@@ -1771,7 +1759,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData(
             // right now default behaviour on these
             break;
         default :
             // right now default behaviour on these
             break;
         default :

-            
+

             if ( item != NULL ){
                 err = item->GetSetData( this, property , itemData , changeValue );
             }
             if ( item != NULL ){
                 err = item->GetSetData( this, property , itemData , changeValue );
             }


@@ -1802,13 +1790,13 @@ void wxMacDataItemBrowserControl::ItemNotification(
 unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container,
         bool recurse , DataBrowserItemState state) const
 {
 unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container,
         bool recurse , DataBrowserItemState state) const
 {

-    UInt32 numItems = 0;
+    ItemCount numItems = 0;

     verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container,
         recurse, state, &numItems ) );
     return numItems;
 }
 
     verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container,
         recurse, state, &numItems ) );
     return numItems;
 }
 

-unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container, 
+unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container,

         bool recurse ) const
 {
     return GetItemCount( container, recurse, kDataBrowserItemIsSelected );
         bool recurse ) const
 {
     return GetItemCount( container, recurse, kDataBrowserItemIsSelected );


@@ -1870,7 +1858,7 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container,
 }
 
 void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,
 }
 
 void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,

-                                            const wxString& title, SInt16 just, int minWidth, int maxWidth)
+                                            const wxString& title, SInt16 just, int defaultWidth)

 {
     DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;
 {
     DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;


@@ -1879,11 +1867,11 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
     columnDesc.headerBtnDesc.btnFontStyle.flags =
         kControlUseFontMask | kControlUseJustMask;
 
     columnDesc.headerBtnDesc.btnFontStyle.flags =
         kControlUseFontMask | kControlUseJustMask;
 

-    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly; 
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly;

     columnDesc.headerBtnDesc.btnFontStyle.just = just;
     columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
     columnDesc.headerBtnDesc.btnFontStyle.style = normal;
     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;
     // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is
     // defined for other modes?
     wxFontEncoding enc;


@@ -1893,26 +1881,27 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
         enc = wxLocale::GetSystemEncoding();
     wxMacCFStringHolder cfTitle;
     cfTitle.Assign( title, enc );
         enc = wxLocale::GetSystemEncoding();
     wxMacCFStringHolder cfTitle;
     cfTitle.Assign( title, enc );

-    columnDesc.headerBtnDesc.titleString = cfTitle; 
-    
-    int colMinWidth = 0;
-    if (minWidth != -1)
-        colMinWidth = minWidth;
-    columnDesc.headerBtnDesc.minimumWidth = colMinWidth;
-    
-    int colMaxWidth = 500;
-    if (maxWidth != -1)
-        colMaxWidth = maxWidth;
-    columnDesc.headerBtnDesc.maximumWidth = colMaxWidth;
+    columnDesc.headerBtnDesc.titleString = cfTitle;
+
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 30000;

 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;
 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;

-    columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewDefaultColumnFlags | kDataBrowserListViewNoGapForIconInHeaderButton; 
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;

 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
 #endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
 #endif

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
+#endif

 
     verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
 
     verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );

+
+    if (defaultWidth > 0){
+        SetColumnWidth(colId, defaultWidth);
+    }
+

 }
 
 void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width)
 }
 
 void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width)


@@ -1952,7 +1941,7 @@ void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacD
 void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item)
 {
     OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,
 void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item)
 {
     OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1,

-        (UInt32*) &item, kDataBrowserItemNoProperty );
+        (DataBrowserItemID*) &item, kDataBrowserItemNoProperty );

     verify_noerr( err );
 }
 
     verify_noerr( err );
 }
 


@@ -1964,7 +1953,7 @@ void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayM
         items[i] = (DataBrowserItemID) itemArray[i];
 
     OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,
         items[i] = (DataBrowserItemID) itemArray[i];
 
     OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems,

-        (UInt32*) items, kDataBrowserItemNoProperty );
+        (DataBrowserItemID*) items, kDataBrowserItemNoProperty );

     verify_noerr( err );
     delete [] items;
 }
     verify_noerr( err );
     delete [] items;
 }


@@ -2031,36 +2020,9 @@ void wxMacDataItemBrowserControl::MacDelete( unsigned int n )
     RemoveItem( wxMacDataBrowserRootContainer, item );
 }
 
     RemoveItem( wxMacDataBrowserRootContainer, item );
 }
 

-void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxString& text, int column )
-{
-    wxMacDataItem* newItem = CreateItem();
-    newItem->SetLabel( text );
-    if ( column != -1 )
-        newItem->SetColumn( kMinColumnId + column );
-
-    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() + 1 );
-        }
-
-        SInt32 frontLineOrder = 0;
-        if ( n > 0 )
-        {
-            wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
-            frontLineOrder = iter->GetOrder();
-        }
-        newItem->SetOrder( frontLineOrder + 1 );
-    }
-
-    AddItem( wxMacDataBrowserRootContainer, newItem );
-}
-
-void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString& items, int column )
+void wxMacDataItemBrowserControl::MacInsert( unsigned int n,
+                                             const wxArrayStringsAdapter& items,
+                                             int column )

 {
     size_t itemsCount = items.GetCount();
     if ( itemsCount == 0 )
 {
     size_t itemsCount = items.GetCount();
     if ( itemsCount == 0 )


@@ -2093,7 +2055,7 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString
         item->SetLabel( items[i]);
         if ( column != -1 )
             item->SetColumn( kMinColumnId + column );
         item->SetLabel( items[i]);
         if ( column != -1 )
             item->SetColumn( kMinColumnId + column );

-        
+

         if ( m_sortOrder == SortOrder_None )
             item->SetOrder( frontLineOrder + 1 + i );
 
         if ( m_sortOrder == SortOrder_None )
             item->SetOrder( frontLineOrder + 1 + i );
 


@@ -2305,6 +2267,8 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 }
 #endif
 
 }
 #endif
 

+#ifndef __LP64__
+

 wxMacPortSaver::wxMacPortSaver( GrafPtr port )
 {
     ::GetPort( &m_port );
 wxMacPortSaver::wxMacPortSaver( GrafPtr port )
 {
     ::GetPort( &m_port );


@@ -2315,5 +2279,36 @@ wxMacPortSaver::~wxMacPortSaver()
 {
     ::SetPort( m_port );
 }
 {
     ::SetPort( m_port );
 }

+#endif
+
+void wxMacGlobalToLocal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+    HIPoint p = CGPointMake( pt->h, pt->v );
+    HIViewRef contentView ;
+    // TODO check toolbar offset
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+    HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
+    pt->h = p.x;
+    pt->v = p.y;
+#else
+    QDGlobalToLocalPoint( GetWindowPort(window), pt ) ;
+#endif
+}
+
+void wxMacLocalToGlobal( WindowRef window , Point*pt )
+{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+    HIPoint p = CGPointMake( pt->h, pt->v );
+    HIViewRef contentView ;
+    // TODO check toolbar offset
+    HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ;
+    HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
+    pt->h = p.x;
+    pt->v = p.y;
+#else
+    QDLocalToGlobalPoint( GetWindowPort(window), pt ) ;
+#endif
+}

 
 #endif // wxUSE_GUI
 
 #endif // wxUSE_GUI