popup activation scope and l&f

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

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index dcaed50c21a6798b19f72295bd1d48ec8fd215c0..5f0fecb5e2eb434db3128a4d12cf540b4a550c60 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -17,14 +17,13 @@
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)


@@ -34,14 +33,18 @@ 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();
+    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);

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserCheckListControl)

 };
 
 };
 

+IMPLEMENT_DYNAMIC_CLASS( wxMacDataBrowserCheckListControl , wxMacDataBrowserListControl )
+

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


@@ -82,15 +85,15 @@ bool wxCheckListBox::Create(
 
     // this will be increased by our Append command
     wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style );
 
     // this will be increased by our Append command
     wxMacDataBrowserCheckListControl* control = new wxMacDataBrowserCheckListControl( this, pos, size, style );

-    control->SetClientDataType( m_clientDataItemsType );
+    // TODO CHECK control->SetClientDataType( m_clientDataItemsType );

     m_peer = control;
 
     MacPostControlCreate(pos,size);
 
     m_peer = control;
 
     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,10 @@ void wxCheckListBox::Check(unsigned int item, bool check)
     }
 }
 
     }
 }
 

-wxMacCheckListControl* wxCheckListBox::GetPeer() const 
-{ 
-    return dynamic_cast<wxMacCheckListControl*>(m_peer); 
+wxMacCheckListControl* wxCheckListBox::GetPeer() const
+{
+    wxMacDataBrowserCheckListControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserCheckListControl);
+    return lb ? wx_static_cast(wxMacCheckListControl*,lb) : 0 ;

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


@@ -153,14 +157,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 +174,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 +222,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->HandleWindowEvent( event );

                 }
                 break;
 
                 }
                 break;
 


@@ -233,35 +237,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) );
+    wxMacCheckListBoxItem* item = wx_static_cast(wxMacCheckListBoxItem*, GetItemFromLine( n) );

     item->Check( bCheck);
     UpdateItem(wxMacDataBrowserRootContainer, item , kCheckboxColumnId);
 }
 
     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 ) );
-    return item->IsChecked();    
+    wxMacCheckListBoxItem * item = wx_static_cast( wxMacCheckListBoxItem*, GetItemFromLine( n ) );
+    return item->IsChecked();

 }
 
 
 }