Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoor...

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index f84803aecad9bd5615f745ab7064df8a867408b2..755ddbad6e0a2e44b9cd8768e859f3e0212604af 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -27,7 +27,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)

-#if !TARGET_API_MAC_OSX
+#if !__WXMAC_OSX__

     EVT_SIZE( wxListBox::OnSize )
     EVT_CHAR( wxListBox::OnChar )
 #endif
     EVT_SIZE( wxListBox::OnSize )
     EVT_CHAR( wxListBox::OnChar )
 #endif


@@ -106,7 +106,9 @@ static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
                     event.SetString( list->GetString(i) );
                     event.SetInt(i) ;
                     event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
                     event.SetString( list->GetString(i) );
                     event.SetInt(i) ;
                     event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );

-                    list->GetEventHandler()->ProcessEvent(event) ;
+                    wxPostEvent( list->GetEventHandler() , event ) ;
+                    // direct notification is not always having the listbox GetSelection() having in synch with event
+                    // list->GetEventHandler()->ProcessEvent(event) ; 

                 } 
                 break ;
             }
                 } 
                 break ;
             }


@@ -173,10 +175,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    ControlRef browser ;

 
 

-    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , (ControlRef *)&m_macControl ) );
-    browser = (ControlRef) m_macControl ;
+    m_peer = new wxMacControl() ;
+    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 )


@@ -191,7 +192,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     {
         options += kDataBrowserSelectOnlyOne ;
     }
     {
         options += kDataBrowserSelectOnlyOne ;
     }

-    verify_noerr(SetDataBrowserSelectionFlags  (browser, options ) ); 
+    verify_noerr(m_peer->SetSelectionFlags( options ) ); 

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


@@ -219,11 +220,11 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
         kDataBrowserTableViewSelectionColumn ;
 
        
         kDataBrowserTableViewSelectionColumn ;
 
        

-       verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ;
-    verify_noerr(::AutoSizeDataBrowserListViewColumns( browser ) ) ;
-    verify_noerr(::SetDataBrowserHasScrollBars( browser , false , true ) ) ;
-    verify_noerr(::SetDataBrowserTableViewHiliteStyle( browser, kDataBrowserTableViewFillHilite  ) ) ;
-    verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( browser , 0 ) ) ;
+       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;
     DataBrowserCallbacks callbacks ;
     
     callbacks.version = kDataBrowserLatestCallbacks;


@@ -239,7 +240,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
 #endif
 #else
            NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
 #endif

-    SetDataBrowserCallbacks(browser, &callbacks);
+    m_peer->SetCallbacks( &callbacks);

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 


@@ -255,7 +256,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

-    SetControlReference( (ControlRef) m_macControl , NULL ) ;
+    m_peer->SetReference( NULL ) ;

     FreeData() ;
     // avoid access during destruction
     if ( m_macList )
     FreeData() ;
     // avoid access during destruction
     if ( m_macList )


@@ -323,6 +324,8 @@ void wxListBox::Delete(int N)
 
 int wxListBox::DoAppend(const wxString& item)
 {
 
 int wxListBox::DoAppend(const wxString& item)
 {

+    InvalidateBestSize();
+

     int index = m_noItems ;
     m_stringArray.Add( item ) ;
     m_dataArray.Add( NULL );
     int index = m_noItems ;
     m_stringArray.Add( item ) ;
     m_dataArray.Add( NULL );


@@ -510,6 +513,8 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );
     
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
         wxT("invalid index in wxListBox::InsertItems") );
     

+    InvalidateBestSize();
+

     int nItems = items.GetCount();
     
     for ( int i = 0 ; i < nItems ; i++ )
     int nItems = items.GetCount();
     
     for ( int i = 0 ; i < nItems ; i++ )


@@ -617,6 +622,18 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 
 #endif  //USE_OWNER_DRAWN
 
 
 #endif  //USE_OWNER_DRAWN
 

+
+// Some custom controls depend on this
+/* static */ wxVisualAttributes
+wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attr;
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
+    attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    return attr;
+}
+

 // ============================================================================
 // list box control implementation
 // ============================================================================
 // ============================================================================
 // list box control implementation
 // ============================================================================


@@ -624,27 +641,27 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 void wxListBox::MacDelete( int N )
 {
     UInt32 id = m_idArray[N] ;
 void wxListBox::MacDelete( int N )
 {
     UInt32 id = m_idArray[N] ;

-    verify_noerr(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;

     m_idArray.RemoveAt( N ) ;
 }
 
 void wxListBox::MacInsert( int n , const wxString& text)
 {
     m_idArray.RemoveAt( N ) ;
 }
 
 void wxListBox::MacInsert( int n , const wxString& text)
 {

-    verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;

     m_idArray.Insert( m_nextId , n ) ;
     ++m_nextId ;
 }
 
 void wxListBox::MacAppend( const wxString& text)
 {
     m_idArray.Insert( m_nextId , n ) ;
     ++m_nextId ;
 }
 
 void wxListBox::MacAppend( const wxString& text)
 {

-    verify_noerr(::AddDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;
+    verify_noerr( m_peer->AddItems( kDataBrowserNoItem , 1 , (UInt32*) &m_nextId , kDataBrowserItemNoProperty ) ) ;

     m_idArray.Add( m_nextId ) ;
     ++m_nextId ;
 }
 
 void wxListBox::MacClear()
 {
     m_idArray.Add( m_nextId ) ;
     ++m_nextId ;
 }
 
 void wxListBox::MacClear()
 {

-    verify_noerr(::RemoveDataBrowserItems((ControlRef) m_macControl , kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;
+    verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 0 , NULL , kDataBrowserItemNoProperty ) ) ;

     m_idArray.Empty() ;
 }
 
     m_idArray.Empty() ;
 }
 


@@ -657,26 +674,26 @@ void wxListBox::MacSetSelection( int n , bool select )
         if ( n >= 0 )
         {
             UInt32 idOld = m_idArray[n] ;
         if ( n >= 0 )
         {
             UInt32 idOld = m_idArray[n] ;

-            SetDataBrowserSelectedItems((ControlRef) m_macControl , 1 , & idOld , kDataBrowserItemsRemove ) ;
+            m_peer->SetSelectedItems( 1 , & idOld , kDataBrowserItemsRemove ) ;

         }
     }
         }
     }

-    if ( ::IsDataBrowserItemSelected( (ControlRef) m_macControl , id ) != select )
+    if ( m_peer->IsItemSelected( id ) != select )

     {
     {

-        verify_noerr(::SetDataBrowserSelectedItems((ControlRef) m_macControl , 1 , & id , kDataBrowserItemsToggle ) ) ;
+        verify_noerr(m_peer->SetSelectedItems( 1 , & id , kDataBrowserItemsToggle ) ) ;

     }
     MacScrollTo( n ) ;
 }
 
 bool wxListBox::MacIsSelected( int n ) const
 {
     }
     MacScrollTo( n ) ;
 }
 
 bool wxListBox::MacIsSelected( int n ) const
 {

-    return ::IsDataBrowserItemSelected( (ControlRef) m_macControl , m_idArray[n] ) ;
+    return m_peer->IsItemSelected( m_idArray[n] ) ;

 }
 
 int wxListBox::MacGetSelection() const
 {
     for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
     {
 }
 
 int wxListBox::MacGetSelection() const
 {
     for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
     {

-        if ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , m_idArray[i] ) )
+        if ( m_peer->IsItemSelected( m_idArray[i] ) )

         {
             return i ;
         }
         {
             return i ;
         }


@@ -691,7 +708,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     aSelections.Empty();
     for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
     {
     aSelections.Empty();
     for ( size_t i = 0 ; i < m_idArray.GetCount() ; ++i )
     {

-        if ( ::IsDataBrowserItemSelected((ControlRef) m_macControl , m_idArray[i] ) )
+        if ( m_peer->IsItemSelected( m_idArray[i] ) )

         {
             aSelections.Add( i ) ;
             no_sel++ ;
         {
             aSelections.Add( i ) ;
             no_sel++ ;


@@ -704,13 +721,13 @@ void wxListBox::MacSet( int n , const wxString& text )
 {
     // as we don't store the strings we only have to issue a redraw
     UInt32 id = m_idArray[n] ;
 {
     // as we don't store the strings we only have to issue a redraw
     UInt32 id = m_idArray[n] ;

-    verify_noerr( ::UpdateDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+    verify_noerr( m_peer->UpdateItems( kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;

 }
 
 void wxListBox::MacScrollTo( int n )
 {
     UInt32 id = m_idArray[n] ;
 }
 
 void wxListBox::MacScrollTo( int n )
 {
     UInt32 id = m_idArray[n] ;

-    verify_noerr( ::RevealDataBrowserItem((ControlRef) m_macControl , id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;
+    verify_noerr(  m_peer->RevealItem( id , kTextColumnId , kDataBrowserRevealWithoutSelecting ) ) ;

 }
 
 #if !TARGET_API_MAC_OSX
 }
 
 #if !TARGET_API_MAC_OSX