removed mentions of wxUSE_OWNER_DRAWN: unless I miss something, this doesn't make...

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

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index f321e7718fe4f622b2b1b3462b422a4d4b184e9f..9eb1a44cb6f8fe19f5db00bd31c744ea8d9060ed 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -2,7 +2,7 @@
 // Name:        checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Stefan Csomor
 // Name:        checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor


@@ -13,11 +13,11 @@
 // headers & declarations
 // ============================================================================
 
 // headers & declarations
 // ============================================================================
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "checklst.h"
 #endif
 
 #pragma implementation "checklst.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 


@@ -25,7 +25,9 @@
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"

+#ifndef __DARWIN__

 #include <Appearance.h>
 #include <Appearance.h>

+#endif

 
 // ============================================================================
 // implementation of wxCheckListBox
 
 // ============================================================================
 // implementation of wxCheckListBox


@@ -62,10 +64,10 @@ bool wxCheckListBox::Create(wxWindow *parent,
 }
 
 #if TARGET_API_MAC_OSX
 }
 
 #if TARGET_API_MAC_OSX

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

     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
 #else
     DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
 #else

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

     DataBrowserItemNotification message)
 #endif
 {
     DataBrowserItemNotification message)
 #endif
 {


@@ -73,7 +75,7 @@ static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
     if ( ref )
     {
         wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
     if ( ref )
     {
         wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;

-        size_t i = itemID - 1 ;
+        int i = itemID - 1 ;

         if (i >= 0 && i < list->GetCount() )
         {
             bool trigger = false ;
         if (i >= 0 && i < list->GetCount() )
         {
             bool trigger = false ;


@@ -108,100 +110,100 @@ static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
                 event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
                 wxPostEvent( list->GetEventHandler() , event ) ;
                 // direct notification is not always having the listbox GetSelection() having in synch with event
                 event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
                 wxPostEvent( list->GetEventHandler() , event ) ;
                 // direct notification is not always having the listbox GetSelection() having in synch with event

-                // list->GetEventHandler()->ProcessEvent(event) ; 
-            } 
+                // list->GetEventHandler()->ProcessEvent(event) ;
+            }

         }
     }
 }
 
 
         }
     }
 }
 
 

-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, 
-    DataBrowserItemID itemID, DataBrowserPropertyID property, 
+static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
+    DataBrowserItemID itemID, DataBrowserPropertyID property,

     DataBrowserItemDataRef itemData, Boolean changeValue)
 {
     DataBrowserItemDataRef itemData, Boolean changeValue)
 {

-       OSStatus err = errDataBrowserPropertyNotSupported;
-       
-       if ( ! changeValue )
-       {       
-       switch (property)
-       {
-               
-           case kTextColumnId:
-               {       
-                   long ref = GetControlReference( browser ) ;
-                   if ( ref )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    size_t i = itemID - 1 ;
+    OSStatus err = errDataBrowserPropertyNotSupported;
+
+    if ( ! changeValue )
+    {
+        switch (property)
+        {
+
+            case kTextColumnId:
+            {
+                long ref = GetControlReference( browser ) ;
+                if ( ref )
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
+                    int i = itemID - 1 ;

                     if (i >= 0 && i < list->GetCount() )
                     if (i >= 0 && i < 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 )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    size_t i = itemID - 1 ;
+                    {
+                        wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
+                        verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+                        err = noErr ;
+                    }
+                }
+            }
+            break;
+            case kCheckboxColumnId :
+            {
+                long ref = GetControlReference( browser ) ;
+                if ( ref )
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
+                    int i = itemID - 1 ;

                     if (i >= 0 && i < list->GetCount() )
                     if (i >= 0 && i < 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 )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    size_t i = itemID - 1 ;
+                    {
+                        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 )
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
+                    int i = itemID - 1 ;

                     if (i >= 0 && i < list->GetCount() )
                     if (i >= 0 && i < list->GetCount() )

-                           {
-                               // we have to change this behind the back, since Check() would be triggering another update round
+                    {
+                        // we have to change this behind the back, since Check() would be triggering another update round

                         bool newVal = !list->IsChecked( i ) ;
                         bool newVal = !list->IsChecked( i ) ;

-                               verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , newVal ? kThemeButtonOn : kThemeButtonOff ) ) ;
-                               err = noErr ;
-                               list->m_checks[ i ] = newVal ;
+                        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);
 
                         wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
                         event.SetInt(i);
                         event.SetEventObject(list);
                         list->GetEventHandler()->ProcessEvent(event);

-                           }
-                       }
-               
-               }
-               break ;
-               
-               default :
-               break ;
-           }
-       }
-       
-       return err;
+                    }
+                }
+
+            }
+            break ;
+
+            default :
+            break ;
+        }
+    }
+
+    return err;

 }
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
 }
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,


@@ -211,11 +213,11 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false ;

 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   _T("only one of listbox selection modes can be specified") );
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   _T("only one of listbox selection modes can be specified") );

-    
+

     if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
         return false;
 
     if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
         return false;
 


@@ -224,9 +226,9 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
     verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );

-    
+

 
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
     if ( style & wxLB_MULTIPLE )
 
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
     if ( style & wxLB_MULTIPLE )


@@ -241,47 +243,47 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     {
         options += kDataBrowserSelectOnlyOne ;
     }
     {
         options += kDataBrowserSelectOnlyOne ;
     }

-    verify_noerr(m_peer->SetSelectionFlags( options ) ); 
+    verify_noerr(m_peer->SetSelectionFlags( options ) );

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

-       columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
-               
-       columnDesc.headerBtnDesc.btnFontStyle.flags     = 
-               kControlUseFontMask | kControlUseJustMask;
-       
-       columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
-       columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
-       columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
-       columnDesc.headerBtnDesc.btnFontStyle.style = normal;
-       columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;
+
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );

 
     // check column
 
 
     // check column
 

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

 
 

-       columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
-       columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
-       columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
+    columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |

                                             kDataBrowserDefaultPropertyFlags;
                                             kDataBrowserDefaultPropertyFlags;

-       verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;

 
     // text column
 
 
     // text column
 

-       columnDesc.headerBtnDesc.minimumWidth = 0;
-       columnDesc.headerBtnDesc.maximumWidth = 10000;
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 10000;

 
 

-       columnDesc.propertyDesc.propertyID = kTextColumnId;
-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-       columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn
+    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
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

-        | kDataBrowserListViewTypeSelectColumn
+     | kDataBrowserListViewTypeSelectColumn

 #endif
 #endif

-         ;
+    ;

 
 

-       
-       verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+
+    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;

 
     verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
     verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;
 
     verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
     verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;


@@ -291,15 +293,21 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     DataBrowserCallbacks callbacks ;
     callbacks.version = kDataBrowserLatestCallbacks;
     InitDataBrowserCallbacks(&callbacks);
     DataBrowserCallbacks callbacks ;
     callbacks.version = kDataBrowserLatestCallbacks;
     InitDataBrowserCallbacks(&callbacks);

-    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);        
-       callbacks.u.v1.itemNotificationCallback =
+    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);
+    callbacks.u.v1.itemNotificationCallback =

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-           (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+        (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;

 #else
 #else

-           NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+        NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;

 #endif
     m_peer->SetCallbacks( &callbacks);
 
 #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++ )
     MacPostControlCreate(pos,size) ;
 
     for ( int i = 0 ; i < n ; i++ )


@@ -308,8 +316,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems

-    
-    return TRUE;
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -318,7 +326,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {

-    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
+    wxCHECK_MSG( item < m_checks.GetCount(), false,

                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return m_checks[item] != 0;
                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return m_checks[item] != 0;


@@ -356,7 +364,7 @@ int wxCheckListBox::DoAppend(const wxString& item)
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked

-    m_checks.Insert(FALSE, pos);
+    m_checks.Insert(false, pos);

 
     return pos;
 }
 
     return pos;
 }


@@ -368,7 +376,7 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Insert(FALSE, pos + n);
+        m_checks.Insert(false, pos + n);

     }
 }
 
     }
 }
 


@@ -380,7 +388,7 @@ void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Add(FALSE);
+        m_checks.Add(false);

     }
 }
 
     }
 }