fix wxBrush for the mac build

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

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 9930e5773ceb774e1fdf3902ecaa0339cab89e70..5f0fecb5e2eb434db3128a4d12cf540b4a550c60 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -17,22 +17,33 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"

-#include "wx/arrstr.h"

 
 

-#include "wx/mac/uma.h"
-
-#ifndef __DARWIN__
-#include <Appearance.h>
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

+#include "wx/mac/uma.h"
+

 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 

-const short kTextColumnId = 1024;
-const short kCheckboxColumnId = 1025;
+class wxMacDataBrowserCheckListControl : public wxMacDataBrowserListControl , public wxMacCheckListControl
+{
+public:
+    wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
+    wxMacDataBrowserCheckListControl() {}
+    virtual ~wxMacDataBrowserCheckListControl();
+
+    virtual wxMacDataItem* CreateItem();

 
 

+    virtual bool            MacIsChecked(unsigned int n) const;
+    virtual void            MacCheck(unsigned int n, bool bCheck = true);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserCheckListControl)
+};
+
+IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserCheckListControl , wxMacDataBrowserListControl )

 
 void wxCheckListBox::Init()
 {
 
 void wxCheckListBox::Init()
 {


@@ -53,159 +64,6 @@ bool wxCheckListBox::Create(
     return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );
 }
 
     return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );
 }
 

-#if TARGET_API_MAC_OSX
-static pascal void DataBrowserItemNotificationProc(
-    ControlRef browser,
-    DataBrowserItemID itemID,
-    DataBrowserItemNotification message,
-    DataBrowserItemDataRef itemData )
-#else
-static pascal void DataBrowserItemNotificationProc(
-    ControlRef browser,
-    DataBrowserItemID itemID,
-    DataBrowserItemNotification message )
-#endif
-{
-    long ref = GetControlReference( browser );
-    if (ref != 0)
-    {
-        wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
-        int i = itemID - 1;
-        if ((i >= 0) && (i < (int)list->GetCount()))
-        {
-            bool trigger = false;
-            wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
-            switch ( message )
-            {
-                case kDataBrowserItemDeselected:
-                    if ( list->HasMultipleSelection() )
-                        trigger = true;
-                    break;
-
-                case kDataBrowserItemSelected:
-                    trigger = true;
-                    break;
-
-                case kDataBrowserItemDoubleClicked:
-                    event.SetEventType( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED );
-                    trigger = true;
-                    break;
-
-                 default:
-                    break;
-            }
-
-            if ( trigger )
-            {
-                event.SetEventObject( list );
-                if ( list->HasClientObjectData() )
-                    event.SetClientObject( list->GetClientObject( i ) );
-                else if ( list->HasClientUntypedData() )
-                    event.SetClientData( list->GetClientData( i ) );
-                event.SetString( list->GetString( i ) );
-                event.SetInt( i );
-                event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : true );
-                wxPostEvent( list->GetEventHandler(), event );
-
-                // direct notification is not always having the listbox GetSelection() having in sync with event
-                // list->GetEventHandler()->ProcessEvent( event );
-            }
-        }
-    }
-}
-
-static pascal OSStatus ListBoxGetSetItemData(
-    ControlRef browser,
-    DataBrowserItemID itemID,
-    DataBrowserPropertyID property,
-    DataBrowserItemDataRef itemData,
-    Boolean changeValue )
-{
-    OSStatus err = errDataBrowserPropertyNotSupported;
-
-    if ( !changeValue )
-    {
-        switch (property)
-        {
-            case kTextColumnId:
-            {
-                long ref = GetControlReference( browser );
-                if (ref != 0)
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
-                    int i = itemID - 1;
-                    if ((i >= 0) && (i < (int)list->GetCount()))
-                    {
-                        wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
-                        verify_noerr( ::SetDataBrowserItemDataText( itemData, cf ) );
-                        err = noErr;
-                    }
-                }
-            }
-            break;
-
-            case kCheckboxColumnId:
-            {
-                long ref = GetControlReference( browser );
-                if (ref != 0)
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
-                    int i = itemID - 1;
-                    if ((i >= 0) && (i < (int)list->GetCount()))
-                    {
-                        verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked(i) ? kThemeButtonOn : kThemeButtonOff ) );
-                        err = noErr;
-                    }
-                }
-            }
-            break;
-
-            case kDataBrowserItemIsEditableProperty:
-            {
-                err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
-            }
-            break;
-
-            default:
-            break;
-        }
-    }
-    else
-    {
-        switch ( property )
-        {
-            case kCheckboxColumnId:
-            {
-                long ref = GetControlReference( browser );
-                if (ref != 0)
-                {
-                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
-                    int i = itemID - 1;
-                    if ((i >= 0) && (i < (int)list->GetCount()))
-                    {
-                        // we have to change this behind the back, since Check() would be triggering another update round
-                        bool newVal = !list->IsChecked(i);
-                        verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff ) );
-                        err = noErr;
-                        list->m_checks[i] = newVal;
-
-                        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
-                        event.SetInt( i );
-                        event.SetEventObject( list );
-                        list->GetEventHandler()->ProcessEvent( event );
-                    }
-                }
-            }
-            break;
-
-            default:
-            break;
-        }
-    }
-
-    return err;
-}
-

 bool wxCheckListBox::Create(
    wxWindow *parent,
    wxWindowID id,
 bool wxCheckListBox::Create(
    wxWindow *parent,
    wxWindowID id,


@@ -226,33 +84,56 @@ bool wxCheckListBox::Create(
         return false;
 
     // this will be increased by our Append command
         return false;
 
     // this will be increased by our Append command

-    m_noItems = 0;
-    m_selected = 0;
+    wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style );
+    // TODO CHECK control->SetClientDataType( m_clientDataItemsType );
+    m_peer = control;

 
 

-    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    MacPostControlCreate(pos,size);

 
 

-    m_peer = new wxMacControl( this );
-    OSStatus err = ::CreateDataBrowserControl(
-        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
-        &bounds, kDataBrowserListView, m_peer->GetControlRefAddr() );
-    verify_noerr( err );
+    InsertItems( n , choices , 0 );

 
 

-    DataBrowserSelectionFlags  options = kDataBrowserDragSelect;
-    if ( style & wxLB_MULTIPLE )
-    {
-        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;
-    }
-    else if ( style & wxLB_EXTENDED )
-    {
-        // default behaviour
-    }
-    else
+    // Needed because it is a wxControlWithItems
+    SetInitialSize( size );
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxCheckListBox functions
+// ----------------------------------------------------------------------------
+
+bool wxCheckListBox::IsChecked(unsigned int item) const
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid index in wxCheckListBox::IsChecked") );
+
+    return GetPeer()->MacIsChecked( item );
+}
+
+void wxCheckListBox::Check(unsigned int item, bool check)
+{
+    wxCHECK_RET( IsValid(item),
+                 wxT("invalid index in wxCheckListBox::Check") );
+
+    bool isChecked = GetPeer()->MacIsChecked( item );
+    if ( check != isChecked )

     {
     {

-        options |= kDataBrowserSelectOnlyOne;
+        GetPeer()->MacCheck( item , check );

     }
     }

+}

 
 

-    err = m_peer->SetSelectionFlags( options );
-    verify_noerr( err );
+wxMacCheckListControl* wxCheckListBox::GetPeer() const
+{
+    wxMacDataBrowserCheckListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserCheckListControl);
+    return lb ? wx_static_cast(wxMacCheckListControl*,lb) : 0 ;
+}
+
+const short kCheckboxColumnId = 1026;
+
+wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style)
+    : wxMacDataBrowserListControl( peer, pos, size, style )
+{
+    OSStatus err = noErr;

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


@@ -265,9 +146,7 @@ bool wxCheckListBox::Create(
     columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
     columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
     columnDesc.headerBtnDesc.btnFontStyle.style = normal;
     columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
     columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
     columnDesc.headerBtnDesc.btnFontStyle.style = normal;

-    columnDesc.headerBtnDesc.titleString = NULL; // CFSTR( "" );
-
-    // check column
+    columnDesc.headerBtnDesc.titleString = NULL;

 
     columnDesc.headerBtnDesc.minimumWidth = 30;
     columnDesc.headerBtnDesc.maximumWidth = 30;
 
     columnDesc.headerBtnDesc.minimumWidth = 30;
     columnDesc.headerBtnDesc.maximumWidth = 30;


@@ -278,137 +157,117 @@ bool wxCheckListBox::Create(
         kDataBrowserPropertyIsMutable
         | kDataBrowserTableViewSelectionColumn
         | kDataBrowserDefaultPropertyFlags;
         kDataBrowserPropertyIsMutable
         | kDataBrowserTableViewSelectionColumn
         | kDataBrowserDefaultPropertyFlags;

-    err = m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
-    verify_noerr( err );
-
-    // text column
-
-    columnDesc.headerBtnDesc.minimumWidth = 0;
-    columnDesc.headerBtnDesc.maximumWidth = 10000;

 
 

-    columnDesc.propertyDesc.propertyID = kTextColumnId;
-    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-     | kDataBrowserListViewTypeSelectColumn
-#endif
-    ;
-
-    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
-
-    verify_noerr( m_peer->AutoSizeListViewColumns() );
-    verify_noerr( m_peer->SetHasScrollBars( false, true ) );
-    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite ) );
-    verify_noerr( m_peer->SetListViewHeaderBtnHeight( 0 ) );
-
-    DataBrowserCallbacks callbacks;
-    callbacks.version = kDataBrowserLatestCallbacks;
-    InitDataBrowserCallbacks( &callbacks );
-    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP( &ListBoxGetSetItemData );
-    callbacks.u.v1.itemNotificationCallback =
-#if TARGET_API_MAC_OSX
-        (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP( &DataBrowserItemNotificationProc );
-#else
-        NewDataBrowserItemNotificationUPP( &DataBrowserItemNotificationProc );
-#endif
-    m_peer->SetCallbacks( &callbacks );
-
-#if 0
-    // shouldn't be necessary anymore under 10.2
-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
-    m_peer->SetNeedsFocusRect( true );
-#endif
-
-    MacPostControlCreate( pos, size );
-
-    for ( int i = 0; i < n; i++ )
-    {
-        Append( choices[i] );
-    }
-
-    // Needed because it is a wxControlWithItems
-    SetBestSize( size );
-
-    return true;
+    err = AddColumn( &columnDesc, 0 );
+    verify_noerr( err );

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxCheckListBox functions
-// ----------------------------------------------------------------------------
-
-bool wxCheckListBox::IsChecked(unsigned int item) const
+wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()

 {
 {

-    wxCHECK_MSG( IsValid(item), false,
-                 wxT("invalid index in wxCheckListBox::IsChecked") );

 
 

-    return m_checks[item] != 0;

 }
 
 }
 

-void wxCheckListBox::Check(unsigned int item, bool check)
+class wxMacCheckListBoxItem : public wxMacListBoxItem

 {
 {

-    wxCHECK_RET( IsValid(item),
-                 wxT("invalid index in wxCheckListBox::Check") );
+public :
+    wxMacCheckListBoxItem()
+    {
+        m_isChecked = false;
+    }

 
 

-    bool isChecked = m_checks[item] != 0;
-    if ( check != isChecked )
+    virtual ~wxMacCheckListBoxItem()

     {
     {

-        m_checks[item] = check;
-        UInt32 id = item + 1;
-        OSStatus err = m_peer->UpdateItems(
-            kDataBrowserNoItem, 1, &id,
-            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
-        verify_noerr( err );

     }
     }

-}

 
 

-// ----------------------------------------------------------------------------
-// methods forwarded to wxCheckListBox
-// ----------------------------------------------------------------------------
+    virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
+        DataBrowserPropertyID property,
+        DataBrowserItemDataRef itemData,
+        bool changeValue )
+    {
+        OSStatus err = errDataBrowserPropertyNotSupported;

 
 

-void wxCheckListBox::Delete(unsigned int n)
-{
-    wxCHECK_RET( IsValid(n), wxT("invalid index in wxCheckListBox::Delete") );
+        wxCheckListBox *checklist = wxDynamicCast( owner->GetPeer() , wxCheckListBox );
+        wxCHECK_MSG( checklist != NULL , errDataBrowserPropertyNotSupported , wxT("wxCheckListBox expected"));

 
 

-    wxListBox::Delete( n );
-    m_checks.RemoveAt( n );
-}
+        if ( !changeValue )
+        {
+            switch (property)
+            {
+                case kCheckboxColumnId:
+                    verify_noerr(SetDataBrowserItemDataButtonValue( itemData, m_isChecked ? kThemeButtonOn : kThemeButtonOff ));
+                    err = noErr;
+                    break;

 
 

-int wxCheckListBox::DoAppend(const wxString& item)
-{
-    int pos = wxListBox::DoAppend( item );
+                case kDataBrowserItemIsEditableProperty:
+                    verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true ));
+                    err = noErr;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            switch (property)
+            {
+            case kCheckboxColumnId:
+                {
+                    // we have to change this behind the back, since Check() would be triggering another update round
+                    bool newVal = !m_isChecked;
+                    verify_noerr(SetDataBrowserItemDataButtonValue( itemData, newVal ? kThemeButtonOn : kThemeButtonOff ));
+                    m_isChecked = newVal;
+                    err = noErr;
+
+                    wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
+                    event.SetInt( owner->GetLineFromItem( this ) );
+                    event.SetEventObject( checklist );
+                    checklist->HandleWindowEvent( event );
+                }
+                break;

 
 

-    // the item is initially unchecked
-    m_checks.Insert( false, pos );
+            default:
+                break;
+            }
+        }

 
 

-    return pos;
-}
+        if ( err == errDataBrowserPropertyNotSupported )
+            err = wxMacListBoxItem::GetSetData( owner , property, itemData , changeValue);

 
 

-void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
-{
-    wxListBox::DoInsertItems( items, pos );
+        return err;
+    }

 
 

-    unsigned int count = items.GetCount();
-    for ( unsigned int n = 0; n < count; n++ )
+    void Check( bool check )

     {
     {

-        m_checks.Insert( false, pos + n );
+        m_isChecked = check;
+    }
+    bool IsChecked() const
+    {
+         return m_isChecked;

     }
     }

-}

 
 

-void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
+protected :
+    bool        m_isChecked;
+};
+
+wxMacDataItem* wxMacDataBrowserCheckListControl::CreateItem()

 {
 {

-    // call it first as it does DoClear()
-    wxListBox::DoSetItems( items, clientData );
+    return new wxMacCheckListBoxItem();
+}

 
 

-    unsigned int count = items.GetCount();
-    for ( unsigned int n = 0; n < count; n++ )
-    {
-        m_checks.Add( false );
-    }
+void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)
+{
+    wxMacCheckListBoxItem* item = wx_static_cast(wxMacCheckListBoxItem*, GetItemFromLine( n) );
+    item->Check( bCheck);
+    UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);

 }
 
 }
 

-void wxCheckListBox::DoClear()
+bool wxMacDataBrowserCheckListControl::MacIsChecked( unsigned int n) const

 {
 {

-    m_checks.Empty();
+    wxMacCheckListBoxItem * item = wx_static_cast( wxMacCheckListBoxItem*, GetItemFromLine( n ) );
+    return item->IsChecked();

 }
 
 }
 

+
+

 #endif // wxUSE_CHECKLISTBOX
 #endif // wxUSE_CHECKLISTBOX