Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile errors.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-06-10 23:00:03 +00:00
parent 7631a29204
commit e0272d0578
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/dcclient.h
View File

@@ -29,7 +29,12 @@
// this one if used by wxPaintDC only // this one if used by wxPaintDC only
struct WXDLLEXPORT wxPaintDCInfo; struct WXDLLEXPORT wxPaintDCInfo;
#undef WXDLLEXPORTLOCAL
#define WXDLLEXPORTLOCAL WXDLLEXPORT
WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo); WX_DECLARE_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
#undef WXDLLEXPORTLOCAL
#define WXDLLEXPORTLOCAL
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// DC classes // DC classes

4
include/wx/tokenzr.h
View File

@@ -29,7 +29,7 @@ public:
wxStringTokenizer() { m_retdelims = FALSE;} wxStringTokenizer() { m_retdelims = FALSE;}
virtual ~wxStringTokenizer(); virtual ~wxStringTokenizer();
int CountTokens() count; int CountTokens() const;
bool HasMoreTokens(); bool HasMoreTokens();
wxString NextToken(); wxString NextToken();
@@ -47,7 +47,7 @@ public:
} }
protected: protected:
off_t FindDelims(const wxString& str, const wxString& delims); off_t FindDelims(const wxString& str, const wxString& delims) const;
void EatLeadingDelims(); void EatLeadingDelims();
wxString m_string, m_delims; wxString m_string, m_delims;

8
src/common/tokenzr.cpp
View File

@@ -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++ ) for ( int i = 0; i < str.Length(); i++ )
{ {
@@ -55,7 +55,7 @@ int wxStringTokenizer::CountTokens() const
{ {
wxString p_string = m_string; wxString p_string = m_string;
bool found = TRUE; bool found = TRUE;
int pos, count = 1; int pos, count = 1;
if (p_string.Length() == 0) if (p_string.Length() == 0)
return 0; return 0;
@@ -77,13 +77,13 @@ int wxStringTokenizer::CountTokens() const
return count; return count;
} }
bool wxStringTokenizer::HasMoreToken() bool wxStringTokenizer::HasMoreTokens()
{ {
return !m_string.IsEmpty(); return !m_string.IsEmpty();
} }
// needed to fix leading whitespace / mult. delims bugs // needed to fix leading whitespace / mult. delims bugs
void wxStringTokenizer::EatLeadingDelims() void wxStringTokenizer::EatLeadingDelims()
{ {
int pos; int pos;