fixes to menu stock items support (patch 1547639)

[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 7aa58cc559e284139923ad65be000bc6af846078..b0385c8ed72804c303a764c3c2e206a24f8e6525 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -21,9 +21,36 @@
 // forward decl for GetSelections()
 class wxArrayInt;
 
 // forward decl for GetSelections()
 class wxArrayInt;
 

+// exposed for subclasses like wxCheckListBox
+
+class wxMacListControl
+{
+public:
+    virtual void            MacDelete( unsigned int n ) = 0;
+    virtual void            MacInsert( unsigned int n, const wxString& item ) = 0;
+    virtual void            MacInsert( unsigned int n, const wxArrayString& items ) = 0;
+    // returns index of newly created line
+    virtual int             MacAppend( const wxString& item ) = 0;
+    virtual void            MacSetString( unsigned int n, const wxString& item ) = 0;
+    virtual void            MacClear() = 0;
+    virtual void            MacDeselectAll() = 0;
+    virtual void            MacSetSelection( unsigned int n, bool select ) = 0;
+    virtual int             MacGetSelection() const = 0;
+    virtual int             MacGetSelections( wxArrayInt& aSelections ) const = 0;
+    virtual bool            MacIsSelected( unsigned int n ) const = 0;
+    virtual void            MacScrollTo( unsigned int n ) = 0;
+    virtual wxString        MacGetString( unsigned int n) const = 0;
+    virtual unsigned int    MacGetCount() const = 0;
+
+    virtual void            MacSetClientData( unsigned int n, void * data) = 0;
+    virtual void *          MacGetClientData( unsigned int) const = 0;
+
+    virtual ~wxMacListControl() { }
+};
+

 // List box item
 
 // List box item
 

-WX_DEFINE_ARRAY( char * , wxListDataArray ) ;
+WX_DEFINE_ARRAY( char* , wxListDataArray );

 
 // ----------------------------------------------------------------------------
 // List box control
 
 // ----------------------------------------------------------------------------
 // List box control


@@ -34,110 +61,97 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase
 public:
     // ctors and such
     wxListBox();
 public:
     // ctors and such
     wxListBox();

-    wxListBox(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
+
+    wxListBox(
+        wxWindow *parent,
+        wxWindowID winid,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr)

     {
     {

-        Create(parent, id, pos, size, n, choices, style, validator, name);
+        Create(parent, winid, pos, size, n, choices, style, validator, name);

     }
     }

-    wxListBox(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxListBoxNameStr)
+
+    wxListBox(
+        wxWindow *parent,
+        wxWindowID winid,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr)

     {
     {

-        Create(parent, id, pos, size, choices, style, validator, name);
+        Create(parent, winid, pos, size, choices, style, validator, name);

     }
 
     }
 

-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
+    bool Create(
+        wxWindow *parent,
+        wxWindowID winid,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0,
+        const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);
+
+    bool Create(
+        wxWindow *parent,
+        wxWindowID winid,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);

 
     virtual ~wxListBox();
 
     virtual ~wxListBox();

-    virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);

 
     // implement base class pure virtuals
 
     // implement base class pure virtuals

+    virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);

     virtual void Clear();
     virtual void Clear();

-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);

 
 

-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);

     virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     virtual int FindString(const wxString& s, bool bCase = false) const;
 
     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 

+    virtual void EnsureVisible(int n);
+

     // wxCheckListBox support
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // wxCheckListBox support
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    // Windows callbacks
-#ifndef __WXMAC_OSX__
-    void OnChar(wxKeyEvent& event);
-#endif
-
-    void*           m_macList ;
-    wxArrayString   m_stringArray ;
-    wxListDataArray m_dataArray ;
+    wxMacListControl* GetPeer() const;

 
 

-    // 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:

-    virtual void DoSetSelection(int n, bool select);
+    // from wxItemContainer

     virtual int DoAppend(const wxString& item);
     virtual int DoAppend(const wxString& item);

-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
+
+    // from wxListBoxBase
+    virtual void DoSetSelection(int n, bool select);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);

     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);

-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

     virtual int DoListHitTest(const wxPoint& point) const;
 
     virtual int DoListHitTest(const wxPoint& point) const;
 

-    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 ) ;
-    bool            MacSuppressSelection( bool suppress ) ;
-

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

-    int m_noItems;
-    int m_selected;
-    bool m_suppressSelection ;
-    wxString  m_typeIn ;
-    long      m_lastTypeIn ;
-

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private: