don't attempt to convert 8bit values to Unicode in ANSI build

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 7e97116a902b0dad5c66cc2077eecd6191cecac4..6fc913dd2c8a7966ba01ac0917c94172f72f0439 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -15,7 +15,6 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

-#include "wx/app.h"

 
 #ifdef __DARWIN__
 #    include <Carbon/Carbon.h>
 
 #ifdef __DARWIN__
 #    include <Carbon/Carbon.h>


@@ -33,7 +32,7 @@
 #endif
 
 #if UNIVERSAL_INTERFACES_VERSION < 0x0342
 #endif
 
 #if UNIVERSAL_INTERFACES_VERSION < 0x0342

-    #error "please update to Apple's lastest universal headers from http://developer.apple.com/sdk/"
+    #error "please update to Apple's latest universal headers from http://developer.apple.com/sdk/"

 #endif
 
 #ifndef MAC_OS_X_VERSION_10_3
 #endif
 
 #ifndef MAC_OS_X_VERSION_10_3


@@ -44,6 +43,10 @@
     #define MAC_OS_X_VERSION_10_4 1040
 #endif
 
     #define MAC_OS_X_VERSION_10_4 1040
 #endif
 

+#ifndef MAC_OS_X_VERSION_10_5
+    #define MAC_OS_X_VERSION_10_5 1050
+#endif
+

 #ifdef __WXMAC_CARBON__
 #include "wx/mac/corefoundation/cfstring.h"
 #endif
 #ifdef __WXMAC_CARBON__
 #include "wx/mac/corefoundation/cfstring.h"
 #endif


@@ -61,11 +64,16 @@ inline int    FixedToInt( Fixed inFixed )
 }
 #endif
 
 }
 #endif
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+typedef UInt32 URefCon;
+typedef SInt32 SRefCon;
+#endif
+

 #if wxUSE_GUI
 
 #if wxUSE_GUI
 

-#include "wx/dc.h"
-#include "wx/window.h"
-#include "wx/toplevel.h"
+#include "wx/listbox.h"
+
+#ifndef __LP64__

 
 class wxMacPortStateHelper
 {
 
 class wxMacPortStateHelper
 {


@@ -143,6 +151,7 @@ private:
     GrafPtr   m_newPort;
     ThemeDrawingState m_themeDrawingState;
 };
     GrafPtr   m_newPort;
     ThemeDrawingState m_themeDrawingState;
 };

+#endif

 
 #if wxMAC_USE_CORE_GRAPHICS
 class WXDLLEXPORT wxMacCGContextStateSaver
 
 #if wxMAC_USE_CORE_GRAPHICS
 class WXDLLEXPORT wxMacCGContextStateSaver


@@ -172,7 +181,8 @@ class wxMacDrawingHelper
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();

-    bool Ok() { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() { return m_ok; }

     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }
     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }


@@ -428,8 +438,6 @@ private :
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-#include "wx/listbox.h"
-

 /*
 GWorldPtr         wxMacCreateGWorld( int width , int height , int depth );
 void                 wxMacDestroyGWorld( GWorldPtr gw );
 /*
 GWorldPtr         wxMacCreateGWorld( int width , int height , int depth );
 void                 wxMacDestroyGWorld( GWorldPtr gw );


@@ -479,19 +487,21 @@ Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxS
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 
 
 ControlActionUPP GetwxMacLiveScrollbarActionProc();
 

-class wxMacControl
+class wxMacControl : public wxObject

 {
 public :
     wxMacControl( wxWindow* peer , bool isRootControl = false );
     wxMacControl( wxWindow* peer , ControlRef control );
     wxMacControl( wxWindow* peer , WXWidget control );
 {
 public :
     wxMacControl( wxWindow* peer , bool isRootControl = false );
     wxMacControl( wxWindow* peer , ControlRef control );
     wxMacControl( wxWindow* peer , WXWidget control );

+    wxMacControl() ;

     virtual ~wxMacControl();
 
     void Init();
 
     virtual void Dispose();
 
     virtual ~wxMacControl();
 
     void Init();
 
     virtual void Dispose();
 

-    bool Ok() const { return GetControlRef() != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetControlRef() != NULL; }

 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);
 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);


@@ -499,7 +509,7 @@ public :
     virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
     virtual ControlRef GetControlRef() const { return m_controlRef; }
 
     virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
     virtual ControlRef GetControlRef() const { return m_controlRef; }
 

-    virtual void SetReference( SInt32 data );
+    virtual void SetReference( URefCon data );

     /*
     void operator= (ControlRef c) { m_controlRef = c; }
     operator ControlRef () { return m_controlRef; }
     /*
     void operator= (ControlRef c) { m_controlRef = c; }
     operator ControlRef () { return m_controlRef; }


@@ -564,9 +574,10 @@ public :
     {
         T value;
         OSStatus err = GetData<T>( inPartCode , inTag , &value );
     {
         T value;
         OSStatus err = GetData<T>( inPartCode , inTag , &value );

-        
-        wxASSERT_MSG(err == noErr, wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
-            inPartCode, inTag));
+
+        wxASSERT_MSG( err == noErr,
+                      wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
+                                       inPartCode, (int)inTag) );

         return value;
     }
     template <typename T> OSStatus GetData( ResType inTag , T *data ) const
         return value;
     }
     template <typename T> OSStatus GetData( ResType inTag , T *data ) const


@@ -578,7 +589,7 @@ public :
     {
         return GetData<T>( kControlEntireControl , inTag );
     }
     {
         return GetData<T>( kControlEntireControl , inTag );
     }

-    
+

     // Flash the control for the specified amount of time
     virtual void Flash( ControlPartCode part , UInt32 ticks = 8 );
 
     // Flash the control for the specified amount of time
     virtual void Flash( ControlPartCode part , UInt32 ticks = 8 );
 


@@ -628,10 +639,9 @@ public :
     virtual void GetFeatures( UInt32 *features );
     virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region );
     virtual OSStatus SetZOrder( bool above , wxMacControl* other );
     virtual void GetFeatures( UInt32 *features );
     virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region );
     virtual OSStatus SetZOrder( bool above , wxMacControl* other );

-            
-    bool    IsCompositing() { return m_isCompositing; }
+

     bool    IsRootControl() { return m_isRootControl; }
     bool    IsRootControl() { return m_isRootControl; }

-    
+

     wxWindow* GetPeer() const
     {
          return m_peer;
     wxWindow* GetPeer() const
     {
          return m_peer;


@@ -646,8 +656,8 @@ protected :
     long        m_windowStyle;
     wxWindow*   m_peer;
     bool        m_needsFocusRect;
     long        m_windowStyle;
     wxWindow*   m_peer;
     bool        m_needsFocusRect;

-    bool        m_isCompositing;

     bool        m_isRootControl;
     bool        m_isRootControl;

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -661,28 +671,31 @@ class wxMacDataBrowserControl : public wxMacControl
 {
 public :
     wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
 {
 public :
     wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);

+    wxMacDataBrowserControl() {}

 
     OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
 
     OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );

-    
+

     OSStatus GetItemCount( DataBrowserItemID container,
             Boolean recurse,
             DataBrowserItemState state,
     OSStatus GetItemCount( DataBrowserItemID container,
             Boolean recurse,
             DataBrowserItemState state,

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

     OSStatus GetItems( DataBrowserItemID container,
             Boolean recurse,
             DataBrowserItemState state,
             Handle items) const;
     OSStatus GetItems( DataBrowserItemID container,
             Boolean recurse,
             DataBrowserItemState state,
             Handle items) const;

-    
+

 
     OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc,
         DataBrowserTableViewColumnIndex position );
 
     OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc,
         DataBrowserTableViewColumnIndex position );

-        
+
+    OSStatus RemoveColumn( DataBrowserTableViewColumnIndex position );
+

     OSStatus AutoSizeColumns();
     OSStatus AutoSizeColumns();

-    
+

     OSStatus SetHasScrollBars( bool horiz, bool vert );
     OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
     OSStatus SetHasScrollBars( bool horiz, bool vert );
     OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );

-    
+

     OSStatus SetHeaderButtonHeight( UInt16 height );
     OSStatus GetHeaderButtonHeight( UInt16 *height );
 
     OSStatus SetHeaderButtonHeight( UInt16 height );
     OSStatus GetHeaderButtonHeight( UInt16 *height );
 


@@ -690,7 +703,7 @@ public :
             const DataBrowserItemID *items,
             DataBrowserPropertyID preSortProperty,
             DataBrowserPropertyID propertyID ) const;
             const DataBrowserItemID *items,
             DataBrowserPropertyID preSortProperty,
             DataBrowserPropertyID propertyID ) const;

-            
+

     OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
             const DataBrowserItemID *items,
             DataBrowserPropertyID preSortProperty );
     OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
             const DataBrowserItemID *items,
             DataBrowserPropertyID preSortProperty );


@@ -708,46 +721,48 @@ public :
             const DataBrowserItemID *items,
             DataBrowserSetOption operation );
 
             const DataBrowserItemID *items,
             DataBrowserSetOption operation );
 

-    OSStatus GetItemID( DataBrowserTableViewRowIndex row, 
+    OSStatus GetItemID( DataBrowserTableViewRowIndex row,

             DataBrowserItemID * item ) const;
             DataBrowserItemID * item ) const;

-    OSStatus GetItemRow( DataBrowserItemID item, 
+    OSStatus GetItemRow( DataBrowserItemID item,

             DataBrowserTableViewRowIndex * row ) const;
             DataBrowserTableViewRowIndex * row ) const;

-            
+

     OSStatus SetDefaultRowHeight( UInt16 height );
     OSStatus GetDefaultRowHeight( UInt16 * height ) const;
     OSStatus SetDefaultRowHeight( UInt16 height );
     OSStatus GetDefaultRowHeight( UInt16 * height ) const;

-    
+

     OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height);
     OSStatus GetRowHeight( DataBrowserItemID item , UInt16 *height) const;
     OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height);
     OSStatus GetRowHeight( DataBrowserItemID item , UInt16 *height) const;

-    
+

     OSStatus GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const;
     OSStatus SetColumnWidth( DataBrowserPropertyID column , UInt16 width );
     OSStatus GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const;
     OSStatus SetColumnWidth( DataBrowserPropertyID column , UInt16 width );

-     
+

     OSStatus GetDefaultColumnWidth( UInt16 *width ) const;
     OSStatus SetDefaultColumnWidth( UInt16 width );
     OSStatus GetDefaultColumnWidth( UInt16 *width ) const;
     OSStatus SetDefaultColumnWidth( UInt16 width );

-    
+

     OSStatus GetColumnCount( UInt32* numColumns) const;
 
     OSStatus GetColumnCount( UInt32* numColumns) const;
 

-    OSStatus GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const;
-    OSStatus SetColumnPosition( DataBrowserPropertyID column, UInt32 position);
-    
+    OSStatus GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id );
+
+    OSStatus GetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex *position) const;
+    OSStatus SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position);
+

     OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
     OSStatus SetScrollPosition( UInt32 top , UInt32 left );
     OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
     OSStatus SetScrollPosition( UInt32 top , UInt32 left );

-    
+

     OSStatus GetSortProperty( DataBrowserPropertyID *column ) const;
     OSStatus SetSortProperty( DataBrowserPropertyID column );
     OSStatus GetSortProperty( DataBrowserPropertyID *column ) const;
     OSStatus SetSortProperty( DataBrowserPropertyID column );

-     
+

     OSStatus GetSortOrder( DataBrowserSortOrder *order ) const;
     OSStatus SetSortOrder( DataBrowserSortOrder order );
     OSStatus GetSortOrder( DataBrowserSortOrder *order ) const;
     OSStatus SetSortOrder( DataBrowserSortOrder order );

-     
+

     OSStatus GetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags *flags ) const;
     OSStatus SetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags flags );
     OSStatus GetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags *flags ) const;
     OSStatus SetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags flags );

-    
+

     OSStatus GetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ) const;
     OSStatus SetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc );
     OSStatus GetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ) const;
     OSStatus SetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc );

-    
+

     OSStatus SetDisclosureColumn( DataBrowserPropertyID property , Boolean expandableRows );
 protected :
     OSStatus SetDisclosureColumn( DataBrowserPropertyID property , Boolean expandableRows );
 protected :

-    
+

     static pascal void DataBrowserItemNotificationProc(
         ControlRef browser,
         DataBrowserItemID itemID,
     static pascal void DataBrowserItemNotificationProc(
         ControlRef browser,
         DataBrowserItemID itemID,


@@ -773,18 +788,19 @@ protected :
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(
         Boolean changeValue ) = 0;
 
     static pascal Boolean DataBrowserCompareProc(

-           ControlRef browser, 
-           DataBrowserItemID itemOneID, 
-           DataBrowserItemID itemTwoID, 
-           DataBrowserPropertyID sortProperty);
-           
-       virtual Boolean CompareItems(DataBrowserItemID itemOneID, 
-           DataBrowserItemID itemTwoID, 
-           DataBrowserPropertyID sortProperty) = 0;
+        ControlRef browser,
+        DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty);
+
+    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
+        DataBrowserItemID itemTwoID,
+        DataBrowserPropertyID sortProperty) = 0;
+    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)

 };
 
 // ============================================================================
 };
 
 // ============================================================================

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

 // ============================================================================
 //
 // basing on data item objects
 // ============================================================================
 //
 // basing on data item objects


@@ -793,28 +809,92 @@ protected :
 // forward decl
 
 class wxMacDataItemBrowserControl;
 // forward decl
 
 class wxMacDataItemBrowserControl;

+class wxMacListBoxItem;
+
+const DataBrowserPropertyID kTextColumnId = 1024;
+const DataBrowserPropertyID kNumericOrderColumnId = 1025;
+
+// for multi-column controls, we will use this + the column ID to identify the
+// column. We don't use kTextColumnId there, and ideally the two should merge.
+const DataBrowserPropertyID kMinColumnId = 1050;
+
+// base API for high-level databrowser operations
+
+class wxMacListControl
+{
+public:
+    virtual void            MacDelete( unsigned int n ) = 0;
+    virtual void            MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 ) = 0;
+    // returns index of newly created line
+    virtual int             MacAppend( const wxString& item ) = 0;
+    virtual void            MacSetString( unsigned int n, const wxString& item ) = 0;
+    virtual void            MacClear() = 0;
+    virtual void            MacDeselectAll() = 0;
+    virtual void            MacSetSelection( unsigned int n, bool select, bool multi ) = 0;
+    virtual int             MacGetSelection() const = 0;
+    virtual int             MacGetSelections( wxArrayInt& aSelections ) const = 0;
+    virtual bool            MacIsSelected( unsigned int n ) const = 0;
+    virtual void            MacScrollTo( unsigned int n ) = 0;
+    virtual wxString        MacGetString( unsigned int n) const = 0;
+    virtual unsigned int    MacGetCount() const = 0;
+
+    virtual void            MacSetClientData( unsigned int n, void * data) = 0;
+    virtual void *          MacGetClientData( unsigned int) const = 0;
+
+    virtual ~wxMacListControl() { }
+};

 
 // base class for databrowser items
 
 
 // base class for databrowser items
 

+enum DataItemType {
+    DataItem_Text
+};
+

 class wxMacDataItem
 {
 public :
     wxMacDataItem();
     virtual ~wxMacDataItem();
 class wxMacDataItem
 {
 public :
     wxMacDataItem();
     virtual ~wxMacDataItem();

-    
-    virtual bool IsLessThan(wxMacDataItemBrowserControl *owner , 
-        const wxMacDataItem*, 
+
+    virtual bool IsLessThan(wxMacDataItemBrowserControl *owner ,
+        const wxMacDataItem*,

         DataBrowserPropertyID property) const;
         DataBrowserPropertyID property) const;

-    
+

     // returns true if access was successful, otherwise false
     // returns true if access was successful, otherwise false

-    virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner , 
+    virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner ,

         DataBrowserPropertyID property,
         DataBrowserItemDataRef itemData,
         bool changeValue );
 
         DataBrowserPropertyID property,
         DataBrowserItemDataRef itemData,
         bool changeValue );
 

-    virtual void Notification(wxMacDataItemBrowserControl *owner , 
+    virtual void Notification(wxMacDataItemBrowserControl *owner ,

         DataBrowserItemNotification message,
         DataBrowserItemDataRef itemData ) const;
         DataBrowserItemNotification message,
         DataBrowserItemDataRef itemData ) const;

+
+    void SetLabel( const wxString& str);
+    const wxString& GetLabel() const;
+
+    void SetOrder( SInt32 order );
+    SInt32 GetOrder() const;
+
+    void SetData( void* data);
+    void* GetData() const;
+
+    void SetColumn( short col );
+    short GetColumn();
+
+protected :
+    wxString    m_label;
+    wxMacCFStringHolder m_cfLabel;
+    void *      m_data;
+    SInt32      m_order;
+    DataBrowserPropertyID m_colId;
+
+};
+
+enum ListSortOrder {
+    SortOrder_None,
+    SortOrder_Text_Ascending,
+    SortOrder_Text_Descending

 };
 
 typedef wxMacDataItem* wxMacDataItemPtr;
 };
 
 typedef wxMacDataItem* wxMacDataItemPtr;


@@ -822,43 +902,55 @@ const wxMacDataItemPtr wxMacDataBrowserRootContainer = NULL;
 
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE);
 
 
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE);
 

-class wxMacDataItemBrowserControl : public wxMacDataBrowserControl
+class wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl

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

-    
+    wxMacDataItemBrowserControl() {}
+    // create a list item (can be a subclass of wxMacListBoxItem)
+
+    virtual wxMacDataItem* CreateItem();
+

     unsigned int    GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const;
     unsigned int    GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const;

-    void            GetItems(const wxMacDataItem* container, bool recurse , 
+    void            GetItems(const wxMacDataItem* container, bool recurse ,

                         DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const;
                         DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const;

-                        
+
+    unsigned int    GetSelectedItemCount( const wxMacDataItem* container, bool recurse ) const;
+

     unsigned int    GetLineFromItem(const wxMacDataItem *item) const;
     wxMacDataItem * GetItemFromLine(unsigned int n) const;
     unsigned int    GetLineFromItem(const wxMacDataItem *item) const;
     wxMacDataItem * GetItemFromLine(unsigned int n) const;

-    
-    void            UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item, 
+
+    void            UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item,

                         DataBrowserPropertyID property) const;
                         DataBrowserPropertyID property) const;

-    void            UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items, 
+    void            UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items,

                         DataBrowserPropertyID property) const;
                         DataBrowserPropertyID property) const;

-    
+
+    void            InsertColumn(int colId, DataBrowserPropertyType colType,
+                            const wxString& title, SInt16 just = teFlushDefault, int defaultWidth = -1);
+
+    int             GetColumnWidth(int colId);
+    void            SetColumnWidth(int colId, int width);
+

     void            AddItem(wxMacDataItem *container, wxMacDataItem *item);
     void            AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items );
 
     void            RemoveAllItems(wxMacDataItem *container);
     void            RemoveItem(wxMacDataItem *container, wxMacDataItem* item);
     void            RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items);
     void            AddItem(wxMacDataItem *container, wxMacDataItem *item);
     void            AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items );
 
     void            RemoveAllItems(wxMacDataItem *container);
     void            RemoveItem(wxMacDataItem *container, wxMacDataItem* item);
     void            RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items);

-    
+

     void            SetSelectedItem( wxMacDataItem* item , DataBrowserSetOption option);
     void            SetSelectedItems( wxArrayMacDataItemPtr &items , DataBrowserSetOption option);
     void            SetSelectedAllItems( DataBrowserSetOption option);
     Boolean         IsItemSelected( const wxMacDataItem* item) const;
     void            SetSelectedItem( wxMacDataItem* item , DataBrowserSetOption option);
     void            SetSelectedItems( wxArrayMacDataItemPtr &items , DataBrowserSetOption option);
     void            SetSelectedAllItems( DataBrowserSetOption option);
     Boolean         IsItemSelected( const wxMacDataItem* item) const;

-    
+

     void            RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options);
     void            RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options);

-    
+

     void            GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const;
     void            GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const;

-    
+

     // item aware methods, to be used in subclasses
     // item aware methods, to be used in subclasses

-    
-    virtual Boolean CompareItems(const wxMacDataItem* itemOneID, 
-                        const wxMacDataItem* itemTwoID, 
+
+    virtual Boolean CompareItems(const wxMacDataItem* itemOneID,
+                        const wxMacDataItem* itemTwoID,

                         DataBrowserPropertyID sortProperty);
 
     virtual OSStatus GetSetItemData(wxMacDataItem* itemID,
                         DataBrowserPropertyID sortProperty);
 
     virtual OSStatus GetSetItemData(wxMacDataItem* itemID,


@@ -870,11 +962,60 @@ public :
                         const wxMacDataItem* itemID,
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData);
                         const wxMacDataItem* itemID,
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData);

-    
+
+    // as we are getting the same events for human and API selection we have to suppress
+    // events in the latter case, since this will be used from many subclasses we keep it here
+
+    bool            IsSelectionSuppressed() const { return m_suppressSelection; }
+    bool            SuppressSelection( bool suppress );
+
+
+    // wxMacListControl Methods
+    // add and remove
+
+    virtual void            MacDelete( unsigned int n );
+    virtual void            MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 );
+    virtual int             MacAppend( const wxString& item );
+    virtual void            MacClear();
+
+    // selecting
+
+    virtual void            MacDeselectAll();
+    virtual void            MacSetSelection( unsigned int n, bool select, bool multi = false );
+    virtual int             MacGetSelection() const;
+    virtual int             MacGetSelections( wxArrayInt& aSelections ) const;
+    virtual bool            MacIsSelected( unsigned int n ) const;
+
+    // display
+
+    virtual void            MacScrollTo( unsigned int n );
+
+    // accessing content
+
+    virtual void            MacSetString( unsigned int n, const wxString& item );
+    virtual void            MacSetClientData( unsigned int n, void * data);
+    virtual wxString        MacGetString( unsigned int n) const;
+    virtual void *          MacGetClientData( unsigned int) const;
+    virtual unsigned int    MacGetCount() const;
+
+    // client data
+
+    virtual wxClientDataType GetClientDataType() const;
+    virtual void            SetClientDataType(wxClientDataType clientDataItemsType);
+    //virtual ListSortOrder   GetSortOrder() const;
+    //virtual void            SetSortOrder(const ListSortOrder sort);
+
+
+
+protected:
+
+    ListSortOrder m_sortOrder;
+    wxClientDataType m_clientDataItemsType;
+

     // ID aware base methods, should be 'final' ie not changed in subclasses
     // ID aware base methods, should be 'final' ie not changed in subclasses

-    
-    virtual Boolean CompareItems(DataBrowserItemID itemOneID, 
-                        DataBrowserItemID itemTwoID, 
+
+    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
+                        DataBrowserItemID itemTwoID,

                         DataBrowserPropertyID sortProperty);
 
     virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
                         DataBrowserPropertyID sortProperty);
 
     virtual OSStatus GetSetItemData(DataBrowserItemID itemID,


@@ -887,15 +1028,11 @@ public :
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData);
 
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData);
 

-    // as we are getting the same events for human and API selection we have to suppress
-    // events in the latter case, since this will be used from many subclasses we keep it here
-    
-    bool            IsSelectionSuppressed() const { return m_suppressSelection; }
-    bool            SuppressSelection( bool suppress );
-    
+

 private :
 
     bool m_suppressSelection;
 private :
 
     bool m_suppressSelection;

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)

 };
 
 class wxMacDataItemBrowserSelectionSuppressor
 };
 
 class wxMacDataItemBrowserSelectionSuppressor


@@ -903,7 +1040,7 @@ class wxMacDataItemBrowserSelectionSuppressor
 public :
     wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
     ~wxMacDataItemBrowserSelectionSuppressor();
 public :
     wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
     ~wxMacDataItemBrowserSelectionSuppressor();

-    
+

 private :
 
     bool m_former;
 private :
 
     bool m_former;


@@ -913,101 +1050,42 @@ private :
 // ============================================================================
 // platform listbox implementation
 // ============================================================================
 // ============================================================================
 // platform listbox implementation
 // ============================================================================

-//
+

 // exposed for reuse in wxCheckListBox
 
 class wxMacListBoxItem : public wxMacDataItem
 {
 public :
     wxMacListBoxItem();
 // exposed for reuse in wxCheckListBox
 
 class wxMacListBoxItem : public wxMacDataItem
 {
 public :
     wxMacListBoxItem();

-    
-    virtual ~wxMacListBoxItem();
-    
-    void SetLabel( const wxString& str);
-    const wxString& GetLabel() const;
-    
-    virtual bool IsLessThan(wxMacDataItemBrowserControl *owner , 
-        const wxMacDataItem* rhs, 
-        DataBrowserPropertyID sortProperty) const;

 
 

-    virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
-        DataBrowserPropertyID property,
-        DataBrowserItemDataRef itemData,
-        bool changeValue );
+    virtual ~wxMacListBoxItem();

 
 

-    virtual void Notification(wxMacDataItemBrowserControl *owner , 
+    virtual void Notification(wxMacDataItemBrowserControl *owner ,

         DataBrowserItemNotification message,
         DataBrowserItemDataRef itemData ) const;
         DataBrowserItemNotification message,
         DataBrowserItemDataRef itemData ) const;

-        
-    void SetOrder( SInt32 order );
-    SInt32 GetOrder() const;
-    
-    void SetData( void* data);
-    void* GetData() const;
-
-private :
-    wxString    m_label;
-    wxMacCFStringHolder m_cfLabel;
-    void *      m_data;
-    SInt32      m_order;

 };
 
 };
 

-class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl , public wxMacListControl
+class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl

 {
 public:
 {
 public:

-    wxMacDataBrowserListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
-    ~wxMacDataBrowserListControl();
-
-    // create a list item (can be a subclass of wxMacListBoxItem)
+    wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
+    wxMacDataBrowserListControl() {}
+    virtual ~wxMacDataBrowserListControl();

 
 

-    virtual wxMacListBoxItem* CreateItem();
-
-    // add and remove
-    
-    void            MacDelete( unsigned int n );
-    void            MacInsert( unsigned int n, const wxString& item );
-    void            MacInsert( unsigned int n, const wxArrayString& items );
-    int             MacAppend( const wxString& item );
-    void            MacClear();
-
-    // selecting
-    
-    void            MacDeselectAll();
-    void            MacSetSelection( unsigned int n, bool select );
-    int             MacGetSelection() const;
-    int             MacGetSelections( wxArrayInt& aSelections ) const;
-    bool            MacIsSelected( unsigned int n ) const;
-
-    // display
-
-    void            MacScrollTo( unsigned int n );
-
-    // accessing content
-    
-    void            MacSetString( unsigned int n, const wxString& item );
-    void            MacSetClientData( unsigned int n, void * data);
-    wxString        MacGetString( unsigned int n) const;
-    void *          MacGetClientData( unsigned int) const;
-    unsigned int    MacGetCount() const;
-
-    // client data
-
-    wxClientDataType GetClientDataType() const;
-    void            SetClientDataType(wxClientDataType clientDataItemsType);
+    virtual wxMacDataItem* CreateItem();

 
     // pointing back
 
 
     // pointing back
 

-    wxListBox * GetPeer() const;
-private :
-    bool            m_stringSorted;
-    wxClientDataType m_clientDataItemsType;
+    wxWindow * GetPeer() const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)

 };
 
 // ============================================================================
 // graphics implementation
 // ============================================================================
 
 };
 
 // ============================================================================
 // graphics implementation
 // ============================================================================
 

-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT

 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {
 
 class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
 {


@@ -1023,6 +1101,10 @@ public :
     void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     void AddCircle( wxCoord x, wxCoord y , wxCoord r );
 
     void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     void AddCircle( wxCoord x, wxCoord y , wxCoord r );
 

+    // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2)
+    virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) ;
+    virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) ;
+

     // closes the current subpath
     void CloseSubpath();
 
     // closes the current subpath
     void CloseSubpath();
 


@@ -1039,7 +1121,7 @@ public:
     wxMacCGContext( CGrafPtr port );
     wxMacCGContext( CGContextRef cgcontext );
     wxMacCGContext();
     wxMacCGContext( CGrafPtr port );
     wxMacCGContext( CGContextRef cgcontext );
     wxMacCGContext();

-    ~wxMacCGContext();
+    virtual ~wxMacCGContext();

 
     virtual void Clip( const wxRegion &region );
     virtual void StrokePath( const wxGraphicPath *p );
 
     virtual void Clip( const wxRegion &region );
     virtual void StrokePath( const wxGraphicPath *p );


@@ -1052,12 +1134,32 @@ public:
     CGContextRef GetNativeContext();
     void SetNativeContext( CGContextRef cg );
     CGPathDrawingMode GetDrawingMode() const { return m_mode; }
     CGContextRef GetNativeContext();
     void SetNativeContext( CGContextRef cg );
     CGPathDrawingMode GetDrawingMode() const { return m_mode; }

+
+    virtual void Translate( wxCoord dx , wxCoord dy );
+    virtual void Scale( wxCoord xScale , wxCoord yScale );
+    virtual void DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h );
+    virtual void DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h );
+    virtual void PushState();
+    virtual void PopState();
+
+    virtual void DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) ;
+
+    virtual void GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
+                            wxCoord *descent, wxCoord *externalLeading ) const ;
+
+    virtual void GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const ;
+
+    virtual void SetFont( const wxFont &font ) ;
+
+    virtual void SetTextColor( const wxColour &col ) ;

 private:
     CGContextRef m_cgContext;
     CGrafPtr m_qdPort;
     CGPathDrawingMode m_mode;
 private:
     CGContextRef m_cgContext;
     CGrafPtr m_qdPort;
     CGPathDrawingMode m_mode;

+    ATSUStyle m_macATSUIStyle ;

     wxPen m_pen;
     wxBrush m_brush;
     wxPen m_pen;
     wxBrush m_brush;

+    wxColor m_textForegroundColor ;

 };
 
 #endif // wxMAC_USE_CORE_GRAPHICS
 };
 
 #endif // wxMAC_USE_CORE_GRAPHICS


@@ -1071,17 +1173,18 @@ void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size);
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {

-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-
-    friend class WXDLLEXPORT wxIcon;
-    friend class WXDLLEXPORT wxCursor;
+    friend class WXDLLIMPEXP_FWD_CORE wxIcon;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;

 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();
 public:
     wxBitmapRefData(int width , int height , int depth);
     wxBitmapRefData();

-    ~wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData &tocopy);
+
+    virtual ~wxBitmapRefData();

 
     void Free();
 
     void Free();

-    bool Ok() const { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_ok; }

     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }
     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }


@@ -1175,19 +1278,23 @@ private :
 
 ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
 
 
 ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
 

+#ifndef __LP64__
+

 #ifdef WORDS_BIGENDIAN
 #ifdef WORDS_BIGENDIAN

-    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) 
-    { 
-       *rect = (**pict).picFrame; 
+    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
+    {
+       *rect = (**pict).picFrame;

         return rect;
     }
 #else
         return rect;
     }
 #else

-    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) 
-    {   
+    inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
+    {

         return QDGetPictureBounds( pict , rect );
     }
 #endif
 
         return QDGetPictureBounds( pict , rect );
     }
 #endif
 

+#endif
+

 #endif // wxUSE_GUI
 
 #define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
 #endif // wxUSE_GUI
 
 #define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \


@@ -1215,5 +1322,14 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 

+#if wxUSE_GUI
+
+// deprecating QD
+
+void wxMacLocalToGlobal( WindowRef window , Point*pt );
+void wxMacGlobalToLocal( WindowRef window , Point*pt );
+
+#endif
+

 #endif
     // _WX_PRIVATE_H_
 #endif
     // _WX_PRIVATE_H_