fixed compilation problems under Windows

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index cd817ca09123b2c788a67b7386ce92871fc969db..37e106f5f2e6ffab4d1ff996f68dc8853ffb2d1c 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -125,7 +125,7 @@ protected:
      */
   int Index(long lItem, bool bFromEnd = FALSE) const;
     /// search for an item using binary search in a sorted array
      */
   int Index(long lItem, bool bFromEnd = FALSE) const;
     /// search for an item using binary search in a sorted array

-  int Index(long lItem, CMPFUNC fnCompare);
+  int Index(long lItem, CMPFUNC fnCompare) const;

     /// add new element at the end
   void Add(long lItem);
     /// add item assuming the array is sorted with fnCompare function
     /// add new element at the end
   void Add(long lItem);
     /// add item assuming the array is sorted with fnCompare function

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index e499328236c29a4865a5726a35786ea5a542a7f7..4de3774132ff7f0a6ed566f3a4b974dd21198cbc 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -231,7 +231,6 @@ public:
     void SetLine(LineList *pLine);
   };
 
     void SetLine(LineList *pLine);
   };
 

-protected:

   class ConfigGroup
   {
   private:
   class ConfigGroup
   {
   private:

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index b501686ae5ce18143f50dada33e63959e2ee0cfb..7ea0930aef5d7d8df613ff5864b112ff8843b072 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -169,7 +169,7 @@ int wxBaseArray::Index(long lItem, bool bFromEnd) const
 }
 
 // search for an item in a sorted array (binary search)
 }
 
 // search for an item in a sorted array (binary search)

-int wxBaseArray::Index(long lItem, CMPFUNC fnCompare)
+int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const

 {
   uint i,
        lo = 0,
 {
   uint i,
        lo = 0,