Compilation fix

[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 3c80d10883bc53085c4c6bc18700ddd4d5307294..cde52946d117e73494fc78c3b1496435dfb6ecfb 100644 (file)
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.h
+// Name:        wx/mac/carbon/listbox.h

 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,35 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 
 #ifndef _WX_LISTBOX_H_
 #define _WX_LISTBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "listbox.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
 #include  "wx/dynarray.h"
 #include  "wx/arrstr.h"
 

-#if wxUSE_OWNER_DRAWN
-  class WXDLLEXPORT wxOwnerDrawn;
-
-  // define the array of list box items
-  #include  "wx/dynarray.h"
-
-  WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
-#endif // wxUSE_OWNER_DRAWN
-

 // forward decl for GetSelections()
 class wxArrayInt;
 
 // forward decl for GetSelections()
 class wxArrayInt;
 

+// forward decl for GetPeer() 
+class wxMacListControl;
+

 // List box item
 
 // List box item
 

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

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


@@ -48,134 +37,108 @@ 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 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)

     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     {
         Create(parent, id, 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 id,
+        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, id, 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 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);

 
     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 int FindString(const wxString& s) const;
+    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 bool IsSelected(int n) const;

-    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;
 

-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    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 ) ;
-

     // wxCheckListBox support
     // wxCheckListBox support

-#if wxUSE_OWNER_DRAWN
-    // plug-in for derived classes
-    virtual wxOwnerDrawn *CreateItem(size_t n);
-
-    // allows to get the item and use SetXXX functions to set it's appearance
-    wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 

-    // get the index of the given item
-    int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
-#endif // wxUSE_OWNER_DRAWN
+    wxMacListControl * GetPeer() const { return (wxMacListControl*)m_peer; }

 
 

+    wxArrayString m_stringArray;
+    wxListDataArray m_dataArray;

     
     

-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+protected:
+    // common creation for all databrowser list implementations
+    wxMacListControl* CreateMacListControl(const wxPoint& pos, const wxSize& size, long style);

     
     

-    // Windows callbacks
-#ifndef __WXMAC_OSX__
-    void OnChar(wxKeyEvent& event);
-#endif
-
-    void*           m_macList ;
-    wxArrayString   m_stringArray ;
-    wxListDataArray m_dataArray ;
+    // internal storage for line n has changed, issue a redraw
+    void MacUpdateLine(int n);

     
     

-    // 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:
-    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 ) ;
+    virtual void DoSetSelection(int n, bool select);
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetFirstItem(int n);
+    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;
+    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual int DoListHitTest(const wxPoint& point) const;
+    virtual wxSize DoGetBestSize() const;

 
     // free memory (common part of Clear() and dtor)
 
     // free memory (common part of Clear() and dtor)

-    // prevent collision with some BSD definitions of macro Free()   
+    // prevent collision with some BSD definitions of macro Free()

     void FreeData();
 
     void FreeData();
 

-    int m_noItems;
-    int m_selected;
-    bool m_suppressSelection ;
-    wxString  m_typeIn ;
-    long      m_lastTypeIn ;
-
-    virtual wxSize DoGetBestSize() const;
-
-#if wxUSE_OWNER_DRAWN
-    // control items
-    wxListBoxItemsArray m_aItems;
-#endif
+    unsigned int m_noItems;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-    // _WX_LISTBOX_H_
+#endif // _WX_LISTBOX_H_