Column position changes after each delete, so always delete the 0 column.

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

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index dcaed50c21a6798b19f72295bd1d48ec8fd215c0..0f87743287a258457100949b4ac22b0cd5624b71 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -17,7 +17,10 @@
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"

-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif

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


@@ -34,10 +37,10 @@ class wxMacDataBrowserCheckListControl : public wxMacDataBrowserListControl , pu
 {
 public:
     wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
 {
 public:
     wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );

-    ~wxMacDataBrowserCheckListControl();
+    virtual ~wxMacDataBrowserCheckListControl();
+
+    virtual wxMacDataItem* CreateItem();

 
 

-    virtual wxMacListBoxItem* CreateItem();
-    

     virtual bool            MacIsChecked(unsigned int n) const;
     virtual void            MacCheck(unsigned int n, bool bCheck = true);
 };
     virtual bool            MacIsChecked(unsigned int n) const;
     virtual void            MacCheck(unsigned int n, bool bCheck = true);
 };


@@ -87,10 +90,10 @@ bool wxCheckListBox::Create(
 
     MacPostControlCreate(pos,size);
 
 
     MacPostControlCreate(pos,size);
 

-       InsertItems( n , choices , 0 );
+    InsertItems( n , choices , 0 );

 
     // Needed because it is a wxControlWithItems
 
     // Needed because it is a wxControlWithItems

-    SetBestSize( size );
+    SetInitialSize( size );

 
     return true;
 }
 
     return true;
 }


@@ -119,9 +122,9 @@ void wxCheckListBox::Check(unsigned int item, bool check)
     }
 }
 
     }
 }
 

-wxMacCheckListControl* wxCheckListBox::GetPeer() const 
-{ 
-    return dynamic_cast<wxMacCheckListControl*>(m_peer); 
+wxMacCheckListControl* wxCheckListBox::GetPeer() const
+{
+    return dynamic_cast<wxMacCheckListControl*>(m_peer);

 }
 
 const short kCheckboxColumnId = 1026;
 }
 
 const short kCheckboxColumnId = 1026;


@@ -153,14 +156,14 @@ wxMacDataBrowserCheckListControl::wxMacDataBrowserCheckListControl( wxListBox *p
         kDataBrowserPropertyIsMutable
         | kDataBrowserTableViewSelectionColumn
         | kDataBrowserDefaultPropertyFlags;
         kDataBrowserPropertyIsMutable
         | kDataBrowserTableViewSelectionColumn
         | kDataBrowserDefaultPropertyFlags;

-        
+

     err = AddColumn( &columnDesc, 0 );
     verify_noerr( err );
 }
 
 wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()
 {
     err = AddColumn( &columnDesc, 0 );
     verify_noerr( err );
 }
 
 wxMacDataBrowserCheckListControl::~wxMacDataBrowserCheckListControl()
 {

-    
+

 }
 
 class wxMacCheckListBoxItem : public wxMacListBoxItem
 }
 
 class wxMacCheckListBoxItem : public wxMacListBoxItem


@@ -170,15 +173,15 @@ public :
     {
         m_isChecked = false;
     }
     {
         m_isChecked = false;
     }

-    
-    ~wxMacCheckListBoxItem()
+
+    virtual ~wxMacCheckListBoxItem()

     {
     }
     {
     }

-    
+

     virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
         DataBrowserPropertyID property,
         DataBrowserItemDataRef itemData,
     virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner ,
         DataBrowserPropertyID property,
         DataBrowserItemDataRef itemData,

-        bool changeValue ) 
+        bool changeValue )

     {
         OSStatus err = errDataBrowserPropertyNotSupported;
 
     {
         OSStatus err = errDataBrowserPropertyNotSupported;
 


@@ -218,7 +221,7 @@ public :
                     wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
                     event.SetInt( owner->GetLineFromItem( this ) );
                     event.SetEventObject( checklist );
                     wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, checklist->GetId() );
                     event.SetInt( owner->GetLineFromItem( this ) );
                     event.SetEventObject( checklist );

-                    checklist->GetEventHandler()->ProcessEvent( event );               
+                    checklist->GetEventHandler()->ProcessEvent( event );

                 }
                 break;
 
                 }
                 break;
 


@@ -233,35 +236,35 @@ public :
         return err;
     }
 
         return err;
     }
 

-    void Check( bool check ) 
+    void Check( bool check )

     {
         m_isChecked = check;
     }
     {
         m_isChecked = check;
     }

-    bool IsChecked() const 
+    bool IsChecked() const

     {
     {

-         return m_isChecked; 
+         return m_isChecked;

     }
 
 protected :
     bool        m_isChecked;
 };
 
     }
 
 protected :
     bool        m_isChecked;
 };
 

-wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem() 
+wxMacDataItem* wxMacDataBrowserCheckListControl::CreateItem()

 {
     return new wxMacCheckListBoxItem();
 }
 
 {
     return new wxMacCheckListBoxItem();
 }
 

-void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck) 
+void wxMacDataBrowserCheckListControl::MacCheck( unsigned int n, bool bCheck)

 {
     wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
     item->Check( bCheck);
     UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
 }
 
 {
     wxMacCheckListBoxItem* item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n) );
     item->Check( bCheck);
     UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
 }
 

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

 {
     wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );
 {
     wxMacCheckListBoxItem * item = dynamic_cast<wxMacCheckListBoxItem*>( GetItemFromLine( n ) );

-    return item->IsChecked();    
+    return item->IsChecked();

 }
 
 
 }