Fixed compile errors.

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

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 06288fba28282cdad1bfd8466a3ad8c65ec0bf63..16949da89b9f4d1cb5970ee624cd1e58403c6160 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -29,7 +29,12 @@
 
 // this one if used by wxPaintDC only
 struct WXDLLEXPORT wxPaintDCInfo;
+
+#undef  WXDLLEXPORTLOCAL
+#define WXDLLEXPORTLOCAL WXDLLEXPORT
 WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
+#undef  WXDLLEXPORTLOCAL
+#define WXDLLEXPORTLOCAL
 
 // ----------------------------------------------------------------------------
 // DC classes

diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h
index 74b8e25d7fbb99216fecba69151b990fd58bbee7..1668cd47ba6d48ee0bdc262e89100f56dd572ce8 100644 (file)
--- a/include/wx/tokenzr.h
+++ b/include/wx/tokenzr.h
@@ -29,7 +29,7 @@ public:
     wxStringTokenizer() { m_retdelims = FALSE;}
     virtual ~wxStringTokenizer();
 
-    int CountTokens() count;
+    int CountTokens() const;
     bool HasMoreTokens();
 
     wxString NextToken();
@@ -47,7 +47,7 @@ public:
     }
 
 protected:
-    off_t FindDelims(const wxString& str, const wxString& delims);
+    off_t FindDelims(const wxString& str, const wxString& delims) const;
     void EatLeadingDelims();
 
     wxString m_string, m_delims;

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index 0307ac3a5412898126b8bff84d7438070c18a178..c4f4bfb899ba68b87ed7f5afea0a2ebd082c1e0b 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -35,7 +35,7 @@ wxStringTokenizer::~wxStringTokenizer()
 {
 }
 
-off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims)
+off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims) const
 {
     for ( int i = 0; i < str.Length(); i++ )
     {
@@ -55,7 +55,7 @@ int wxStringTokenizer::CountTokens() const
 {
     wxString p_string = m_string;
     bool found = TRUE;
-    int pos, count = 1; 
+    int pos, count = 1;
 
     if (p_string.Length() == 0)
         return 0;
@@ -77,13 +77,13 @@ int wxStringTokenizer::CountTokens() const
     return count;
 }
 
-bool wxStringTokenizer::HasMoreToken()
+bool wxStringTokenizer::HasMoreTokens()
 {
     return !m_string.IsEmpty();
 }
 
 // needed to fix leading whitespace / mult. delims bugs
-void wxStringTokenizer::EatLeadingDelims() 
+void wxStringTokenizer::EatLeadingDelims()
 {
     int pos;