don't use border styles for windows in wxUniversal

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

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index 96be3d0f0ea2f7fe1ad98fcd9e7b160a7a9050aa..0d1f1f7ad5f36ce327b1185db5b5343dec9d5539 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -25,7 +25,7 @@
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items
   class WXDLLEXPORT wxOwnerDrawn;
 
   // define the array of list box items

-  #include  <wx/dynarray.h>
+  #include  "wx/dynarray.h"

 
   WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN
 
   WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN


@@ -66,7 +66,8 @@ public:
                 const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();
                 const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();

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

     // implement base class pure virtuals
     virtual void Clear();
     virtual void Delete(int n);
     // implement base class pure virtuals
     virtual void Clear();
     virtual void Delete(int n);


@@ -91,6 +92,7 @@ public:
     virtual void* DoGetItemClientData(int n) const;
     virtual void DoSetItemClientObject(int n, wxClientData* clientData);
     virtual wxClientData* DoGetItemClientObject(int n) const;
     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
 #if wxUSE_OWNER_DRAWN
 
     // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN


@@ -107,11 +109,12 @@ public:
     // Windows callbacks
 
     virtual void SetupColours();
     // Windows callbacks
 
     virtual void SetupColours();

-    virtual void       MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+    virtual void       MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
 

-       ListHandle              m_macList ;
+       void*           m_macList ;

        wxArrayString   m_stringArray ;
        wxListDataArray m_dataArray ;
        wxArrayString   m_stringArray ;
        wxListDataArray m_dataArray ;

+       wxArrayInt m_selectionPreImage ;

        void                    MacSetRedraw( bool doDraw ) ;
 protected:
        void                    MacDestroy() ;                  
        void                    MacSetRedraw( bool doDraw ) ;
 protected:
        void                    MacDestroy() ;                  


@@ -138,7 +141,7 @@ protected:
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;
 

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

 
 #if wxUSE_OWNER_DRAWN
     // control items
 
 #if wxUSE_OWNER_DRAWN
     // control items