adding another assert for tracking modalSession problems

[wxWidgets.git] / src / osx / carbon / listbox.cpp

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 704a65e0e89fd3a6ce119b636ae00235005ddf54..441f9aa930ccc327eeeb17ae41d5f7b9cf6d5d08 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -30,12 +30,12 @@
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* WXUNUSED(parent), 
-                                    wxWindowID WXUNUSED(id), 
-                                    const wxPoint& pos, 
+wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* WXUNUSED(parent),
+                                    wxWindowID WXUNUSED(id),
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long WXUNUSED(extraStyle))
 {
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );
                                     long WXUNUSED(extraStyle))
 {
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );


@@ -43,7 +43,7 @@ wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer,
     return control;
 }
 
     return control;
 }
 

-int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+int wxMacDataBrowserListControl::DoListHitTest(const wxPoint& inpoint) const

 {
     OSStatus err;
 
 {
     OSStatus err;
 


@@ -59,7 +59,7 @@ int wxListBox::DoListHitTest(const wxPoint& inpoint) const
 
     // get column property ID (req. for call to itempartbounds)
     DataBrowserTableViewColumnID colId = 0;
 
     // get column property ID (req. for call to itempartbounds)
     DataBrowserTableViewColumnID colId = 0;

-    err = GetDataBrowserTableViewColumnProperty(m_peer->GetControlRef(), 0, &colId);
+    err = GetDataBrowserTableViewColumnProperty(GetControlRef(), 0, &colId);

     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewColumnProperty"));
 
     // OK, first we need to find the first visible item we have -
     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewColumnProperty"));
 
     // OK, first we need to find the first visible item we have -


@@ -68,17 +68,19 @@ int wxListBox::DoListHitTest(const wxPoint& inpoint) const
     // until we find a visible item, but we can do a cheap calculation
     // via the row height to speed things up a bit
     UInt32 scrollx, scrolly;
     // until we find a visible item, but we can do a cheap calculation
     // via the row height to speed things up a bit
     UInt32 scrollx, scrolly;

-    err = GetDataBrowserScrollPosition(m_peer->GetControlRef(), &scrollx, &scrolly);
+    err = GetDataBrowserScrollPosition(GetControlRef(), &scrollx, &scrolly);

     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserScrollPosition"));
 
     UInt16 height;
     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserScrollPosition"));
 
     UInt16 height;

-    err = GetDataBrowserTableViewRowHeight(m_peer->GetControlRef(), &height);
+    err = GetDataBrowserTableViewRowHeight(GetControlRef(), &height);

     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
 
     wxCHECK_MSG(err == noErr, wxNOT_FOUND, wxT("Unexpected error from GetDataBrowserTableViewRowHeight"));
 

+    wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
+

     // these indices are 0-based, as usual, so we need to add 1 to them when
     // passing them to data browser functions which use 1-based indices
     int low = scrolly / height,
     // these indices are 0-based, as usual, so we need to add 1 to them when
     // passing them to data browser functions which use 1-based indices
     int low = scrolly / height,

-        high = GetCount() - 1;
+        high = list->GetCount() - 1;

 
     // search for the first visible item (note that the scroll guess above
     // is the low bounds of where the item might lie so we only use that as a
 
     // search for the first visible item (note that the scroll guess above
     // is the low bounds of where the item might lie so we only use that as a


@@ -87,7 +89,7 @@ int wxListBox::DoListHitTest(const wxPoint& inpoint) const
     {
         Rect bounds;
         err = GetDataBrowserItemPartBounds(
     {
         Rect bounds;
         err = GetDataBrowserItemPartBounds(

-            m_peer->GetControlRef(), low + 1, colId,
+            GetControlRef(), low + 1, colId,

             kDataBrowserPropertyEnclosingPart,
             &bounds); // note +1 to translate to Mac ID
         if ( err == noErr )
             kDataBrowserPropertyEnclosingPart,
             &bounds); // note +1 to translate to Mac ID
         if ( err == noErr )


@@ -109,7 +111,7 @@ int wxListBox::DoListHitTest(const wxPoint& inpoint) const
 
         Rect bounds;
         err = GetDataBrowserItemPartBounds(
 
         Rect bounds;
         err = GetDataBrowserItemPartBounds(

-            m_peer->GetControlRef(), mid + 1, colId,
+            GetControlRef(), mid + 1, colId,

             kDataBrowserPropertyEnclosingPart,
             &bounds); //note +1 to trans to mac id
         wxCHECK_MSG( err == noErr || err == errDataBrowserItemNotFound,
             kDataBrowserPropertyEnclosingPart,
             &bounds); //note +1 to trans to mac id
         wxCHECK_MSG( err == noErr || err == errDataBrowserItemNotFound,


@@ -135,10 +137,10 @@ int wxListBox::DoListHitTest(const wxPoint& inpoint) const
             }
 
             if ( point.y < bounds.top )
             }
 
             if ( point.y < bounds.top )

-                // index(bounds) greater then key(point)
+                // index(bounds) greater than key(point)

                 high = mid - 1;
             else
                 high = mid - 1;
             else

-                // index(bounds) less then key(point)
+                // index(bounds) less than key(point)

                 low = mid + 1;
         }
     }
                 low = mid + 1;
         }
     }


@@ -175,7 +177,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
             wxListBox *list = wxDynamicCast( owner->GetWXPeer() , wxListBox );
             wxMacDataBrowserCellValue valueholder(itemData);
             list->GetValueCallback( n , col, valueholder );
             wxListBox *list = wxDynamicCast( owner->GetWXPeer() , wxListBox );
             wxMacDataBrowserCellValue valueholder(itemData);
             list->GetValueCallback( n , col, valueholder );

-            
+

             err = noErr;
         }
         else
             err = noErr;
         }
         else


@@ -191,7 +193,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
             }
 
         }
             }
 
         }

-        
+

     }
     else
     {
     }
     else
     {


@@ -226,7 +228,7 @@ OSStatus wxMacListBoxItem::GetSetData(wxMacDataItemBrowserControl *owner ,
     {
         err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue);
     }
     {
         err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue);
     }

-    
+

     return err;
 }
 
     return err;
 }
 


@@ -261,7 +263,7 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     m_nextColumnId = 0 ;
     : wxMacDataItemBrowserControl( peer, pos, size, style )
 {
     m_nextColumnId = 0 ;

-    
+

     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     if ( style & wxLB_SORT )
     OSStatus err = noErr;
     m_clientDataItemsType = wxClientData_None;
     if ( style & wxLB_SORT )


@@ -335,8 +337,8 @@ wxMacDataBrowserListControl::wxMacDataBrowserListControl( wxWindow *peer, const
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2
     err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true );
 #if 0
     // shouldn't be necessary anymore under 10.2

-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
-    m_peer->SetNeedsFocusRect( true );
+    GetPeer()->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    GetPeer()->SetNeedsFocusRect( true );

 #endif
 }
 
 #endif
 }
 


@@ -345,13 +347,13 @@ wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
 }
 
 void wxMacDataBrowserListControl::ItemNotification(
 }
 
 void wxMacDataBrowserListControl::ItemNotification(

-                        const wxMacDataItem* itemID,
+                        DataBrowserItemID itemID,

                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData)
 {
     wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData)
 {
     wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));

-    
+

     if (list->HasMultipleSelection() && (message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         list->CalcAndSendEvent();
     if (list->HasMultipleSelection() && (message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         list->CalcAndSendEvent();


@@ -361,14 +363,14 @@ void wxMacDataBrowserListControl::ItemNotification(
     if ((message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
     if ((message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
     {
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );

-        
+

         int sel = list->GetSelection();
         if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
            return;
         list->HandleLineEvent( sel, false );
         return;
     }
         int sel = list->GetSelection();
         if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
            return;
         list->HandleLineEvent( sel, false );
         return;
     }

-    
+

     // call super for item level(wxMacDataItem->Notification) callback processing
     wxMacDataItemBrowserControl::ItemNotification( itemID, message, itemData);
 }
     // call super for item level(wxMacDataItem->Notification) callback processing
     wxMacDataItemBrowserControl::ItemNotification( itemID, message, itemData);
 }


@@ -385,7 +387,7 @@ wxWindow * wxMacDataBrowserListControl::GetPeer() const
 // List Methods
 //
 
 // List Methods
 //
 

-wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned int pos, DataBrowserPropertyID property, 
+wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,

                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width )
 {
                                 const wxString& title, bool editable,
                                 DataBrowserPropertyType colType, SInt16 just, int width )
 {


@@ -404,7 +406,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     // 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;

-    if ( m_font.Ok() )
+    if ( m_font.IsOk() )

         enc = m_font.GetEncoding();
     else
         enc = wxLocale::GetSystemEncoding();
         enc = m_font.GetEncoding();
     else
         enc = wxLocale::GetSystemEncoding();


@@ -419,7 +421,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
     columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;

-    
+

     if ( editable )
         columnDesc.propertyDesc.propertyFlags |= kDataBrowserPropertyIsMutable;
 
     if ( editable )
         columnDesc.propertyDesc.propertyFlags |= kDataBrowserPropertyIsMutable;
 


@@ -431,38 +433,38 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::DoInsertColumn( unsigned in
     }
 
     wxMacDataBrowserColumn *col = new wxMacDataBrowserColumn( property, colType, editable );
     }
 
     wxMacDataBrowserColumn *col = new wxMacDataBrowserColumn( property, colType, editable );

-    
+

     m_columns.Insert( col, pos );
     m_columns.Insert( col, pos );

-    
+

     return col;
 }
 
     return col;
 }
 

-wxListWidgetColumn* wxMacDataBrowserListControl::InsertTextColumn( unsigned pos, const wxString& title, bool editable, 
-                                wxAlignment just, int defaultWidth) 
+wxListWidgetColumn* wxMacDataBrowserListControl::InsertTextColumn( unsigned pos, const wxString& title, bool editable,
+                                wxAlignment just, int defaultWidth)

 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;
 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;

-    
+

     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;
     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;

-     
-    return DoInsertColumn( pos, property, title, editable, kDataBrowserTextType,  just, defaultWidth );   
+
+    return DoInsertColumn( pos, property, title, editable, kDataBrowserTextType,  just, defaultWidth );

 }
 
 }
 

-wxListWidgetColumn* wxMacDataBrowserListControl::InsertCheckColumn( unsigned pos , const wxString& title, bool editable, 
-                                wxAlignment just, int defaultWidth ) 
+wxListWidgetColumn* wxMacDataBrowserListControl::InsertCheckColumn( unsigned pos , const wxString& title, bool editable,
+                                wxAlignment just, int defaultWidth )

 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;
 {
     DataBrowserPropertyID property = kMinColumnId + m_nextColumnId++;

-    
+

     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;
     SInt16 j = teFlushLeft;
     if ( just & wxALIGN_RIGHT )
         j = teFlushRight;
     else if ( just & wxALIGN_CENTER_HORIZONTAL )
         j = teCenter;

-        
-    return DoInsertColumn( pos, property, title, editable, kDataBrowserCheckboxType,  just, defaultWidth );   
+
+    return DoInsertColumn( pos, property, title, editable, kDataBrowserCheckboxType,  just, defaultWidth );

 }
 
 wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( DataBrowserPropertyID property)
 }
 
 wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( DataBrowserPropertyID property)


@@ -470,7 +472,7 @@ wxMacDataBrowserColumn* wxMacDataBrowserListControl::GetColumnFromProperty( Data
     for ( unsigned int i = 0; i < m_columns.size() ; ++ i )
         if ( m_columns[i]->GetProperty() == property )
             return m_columns[i];
     for ( unsigned int i = 0; i < m_columns.size() ; ++ i )
         if ( m_columns[i]->GetProperty() == property )
             return m_columns[i];

-            
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -579,15 +581,15 @@ void wxMacDataBrowserListControl::ListScrollTo( unsigned int n )
 
     RevealItem( item , kDataBrowserRevealWithoutSelecting );
 }
 
     RevealItem( item , kDataBrowserRevealWithoutSelecting );
 }

-    
-void wxMacDataBrowserListControl::UpdateLine( unsigned int n, wxListWidgetColumn* col ) 
+
+void wxMacDataBrowserListControl::UpdateLine( unsigned int n, wxListWidgetColumn* col )

 {
     wxMacDataBrowserColumn* dbcol = dynamic_cast<wxMacDataBrowserColumn*> (col);
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
     UpdateItem(wxMacDataBrowserRootContainer, item, dbcol ? dbcol->GetProperty() : kDataBrowserNoItem );
 }
 
 {
     wxMacDataBrowserColumn* dbcol = dynamic_cast<wxMacDataBrowserColumn*> (col);
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
     UpdateItem(wxMacDataBrowserRootContainer, item, dbcol ? dbcol->GetProperty() : kDataBrowserNoItem );
 }
 

-void wxMacDataBrowserListControl::UpdateLineToEnd( unsigned int n) 
+void wxMacDataBrowserListControl::UpdateLineToEnd( unsigned int n)

 {
     // with databrowser inserting does not need updating the entire model, it's done by databrowser itself
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
 {
     // with databrowser inserting does not need updating the entire model, it's done by databrowser itself
     wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );


@@ -607,20 +609,24 @@ void wxMacDataBrowserCellValue::Set( const wxString& value )
     SetDataBrowserItemDataText( m_data, (CFStringRef) cf);
 }
 
     SetDataBrowserItemDataText( m_data, (CFStringRef) cf);
 }
 

-void wxMacDataBrowserCellValue::Set( int value ) 
+void wxMacDataBrowserCellValue::Set( int value )

 {
     SetDataBrowserItemDataValue( m_data, value );
 {
     SetDataBrowserItemDataValue( m_data, value );

-    // SetDataBrowserItemDataButtonValue( m_data, value ? kThemeButtonOn : kThemeButtonOff);

 }
 }

-    
-int wxMacDataBrowserCellValue::GetIntValue() const 
+
+void wxMacDataBrowserCellValue::Check( bool check )
+{
+    SetDataBrowserItemDataButtonValue( m_data, check ? kThemeButtonOn : kThemeButtonOff);
+}
+
+int wxMacDataBrowserCellValue::GetIntValue() const

 {
     SInt32 value;
     GetDataBrowserItemDataValue( m_data, &value );
     return value;
 }
 
 {
     SInt32 value;
     GetDataBrowserItemDataValue( m_data, &value );
     return value;
 }
 

-wxString wxMacDataBrowserCellValue::GetStringValue() const 
+wxString wxMacDataBrowserCellValue::GetStringValue() const

 {
     CFStringRef value;
     GetDataBrowserItemDataText ( m_data, &value );
 {
     CFStringRef value;
     GetDataBrowserItemDataText ( m_data, &value );