use WX_DEFINE_ARRAY_PTR for anarray of pointers (fixes Sun CC warning)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unix/mimetype.h b/include/wx/unix/mimetype.h
index cc6f75f2d7869ecbdca5f06de0d75771d00308bb..77d608587adb348a6ec53246142124bd462ec367 100644 (file)
--- a/include/wx/unix/mimetype.h
+++ b/include/wx/unix/mimetype.h
@@ -18,11 +18,11 @@
 
 #include "wx/mimetype.h"
 
 
 #include "wx/mimetype.h"
 

-#if (wxUSE_FILE && wxUSE_TEXTFILE)
+#if wxUSE_MIMETYPE

 
 class wxMimeTypeCommands;
 
 
 class wxMimeTypeCommands;
 

-WX_DEFINE_ARRAY(wxMimeTypeCommands *, wxMimeCommandsArray);
+WX_DEFINE_ARRAY_PTR(wxMimeTypeCommands *, wxMimeCommandsArray);

 
 // this is the real wxMimeTypesManager for Unix
 class WXDLLEXPORT wxMimeTypesManagerImpl
 
 // this is the real wxMimeTypesManager for Unix
 class WXDLLEXPORT wxMimeTypesManagerImpl


@@ -215,9 +215,8 @@ private:
     wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
 };
 
     wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
 };
 

-#endif
-  // wxUSE_FILE
+#endif // wxUSE_MIMETYPE
+
+#endif // _MIMETYPE_IMPL_H

 
 

-#endif
-  //_MIMETYPE_IMPL_H

 
 

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 69914f71b3f42910d71034dd6535048498363cd0..4ebe895d680d139dcc23f8b7d6f3204b35753d45 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -100,7 +100,7 @@ static void DeleteThread(wxThread *This);
 // ----------------------------------------------------------------------------
 
 // an (non owning) array of pointers to threads
 // ----------------------------------------------------------------------------
 
 // an (non owning) array of pointers to threads

-WX_DEFINE_ARRAY(wxThread *, wxArrayThread);
+WX_DEFINE_ARRAY_PTR(wxThread *, wxArrayThread);

 
 // an entry for a thread we can wait for
 
 
 // an entry for a thread we can wait for