fixed loading of resource from ZIP files on MacOS

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

diff --git a/include/wx/mac/listbox.h b/include/wx/mac/listbox.h
index ff4be4552789f7ec0cdeba6fc390f4608bb1ea7c..0d8f38b53e626e0d28ae0a2fc43887860478a3c3 100644 (file)
--- a/include/wx/mac/listbox.h
+++ b/include/wx/mac/listbox.h
@@ -1,25 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        listbox.h
 // Purpose:     wxListBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        listbox.h
 // Purpose:     wxListBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "listbox.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
     #pragma interface "listbox.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------

+#include  "wx/dynarray.h"
+

 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;
 
 #if wxUSE_OWNER_DRAWN
   class WXDLLEXPORT wxOwnerDrawn;


@@ -92,7 +94,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 ) ;
+    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


@@ -110,7 +112,7 @@ public:
 
     virtual void    SetupColours();
     virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
 
     virtual void    SetupColours();
     virtual void    MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

-       virtual bool MacCanFocus() const { return true ; }
+       virtual bool MacCanFocus() const { return true ; }

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


@@ -138,12 +140,13 @@ protected:
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)
     bool HasMultipleSelection() const;
 
     // free memory (common part of Clear() and dtor)

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

 
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;

-       wxString  m_typeIn ;
-       long      m_lastTypeIn ;
+    wxString  m_typeIn ;
+    long      m_lastTypeIn ;

 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;