wxHelpController now wxCHMHelpController on Windows

[wxWidgets.git] / include / wx / mac / carbon / listbox.h

diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index 77c0f27209ffc97c07e43385b01f9c191ba923ca..3c80d10883bc53085c4c6bc18700ddd4d5307294 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -97,7 +97,7 @@ public:
     virtual int FindString(const wxString& s) const;
 
     virtual bool IsSelected(int n) const;
     virtual int FindString(const wxString& s) const;
 
     virtual bool IsSelected(int n) const;

-    virtual void SetSelection(int n, bool select = TRUE);
+    virtual void DoSetSelection(int n, bool select);

     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 


@@ -125,36 +125,35 @@ public:
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
 #endif // wxUSE_OWNER_DRAWN
 

+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // Windows callbacks
     // Windows callbacks

-
-    virtual void    SetupColours();
-    virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-       virtual bool MacCanFocus() const { return true ; }
+#ifndef __WXMAC_OSX__

     void OnChar(wxKeyEvent& event);
     void OnChar(wxKeyEvent& event);

+#endif

 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;
 
     void*           m_macList ;
     wxArrayString   m_stringArray ;
     wxListDataArray m_dataArray ;

-    wxArrayInt      m_selectionPreImage ;
-    void            MacSetRedraw( bool doDraw ) ;
+    
+    // as we are getting the same events for human and API selection we have to suppress
+    // events in the latter case
+    bool                       MacIsSelectionSuppressed() const { return m_suppressSelection ; } 

 protected:
 protected:

-    void            MacDestroy() ;

     void            MacDelete( int n ) ;
     void            MacInsert( int n , const wxString& item) ;
     void            MacAppend( const wxString& item) ;
     void            MacSet( int n , const wxString& item ) ;
     void            MacClear() ;
     void            MacDelete( int n ) ;
     void            MacInsert( int n , const wxString& item) ;
     void            MacAppend( const wxString& item) ;
     void            MacSet( int n , const wxString& item ) ;
     void            MacClear() ;

+    void            MacDeselectAll() ;

     void            MacSetSelection( int n , bool select ) ;
     int             MacGetSelection() const ;
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;
     void            MacSetSelection( int n , bool select ) ;
     int             MacGetSelection() const ;
     int             MacGetSelections(wxArrayInt& aSelections) const ;
     bool            MacIsSelected( int n ) const ;
     void            MacScrollTo( int n ) ;

-    void            OnSize( wxSizeEvent &size ) ;
-    void            MacDoClick() ;
-    void            MacDoDoubleClick() ;
-
-    // do we have multiple selections?
-    bool HasMultipleSelection() const;
+    bool                       MacSuppressSelection( bool suppress ) ;

 
     // free memory (common part of Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   
 
     // free memory (common part of Clear() and dtor)
     // prevent collision with some BSD definitions of macro Free()   


@@ -162,6 +161,7 @@ protected:
 
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;

+    bool m_suppressSelection ;

     wxString  m_typeIn ;
     long      m_lastTypeIn ;
 
     wxString  m_typeIn ;
     long      m_lastTypeIn ;