From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Jul 1998 08:18:57 +0000 (+0000)
Subject: fixed compilation problems under Windows
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e99c30481090eb4ceaec74c0c1b5fac89b235e7f?ds=inline;hp=3848ffef9f9555f6c63daebd0f4e6a1fe2d183cc

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 cd817ca091..37e106f5f2 100644
--- 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, 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
diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index e499328236..4de3774132 100644
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -231,7 +231,6 @@ public:
     void SetLine(LineList *pLine);
   };
 
-protected:
   class ConfigGroup
   {
   private:
diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index b501686ae5..7ea0930aef 100644
--- 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)
-int wxBaseArray::Index(long lItem, CMPFUNC fnCompare)
+int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const
 {
   uint i,
        lo = 0,