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

1. misc compilation (errors, warnings) fixes (from the build logs)

Browse Source 
2. fixed a bug in wxGTK::wxGetResource


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-26 21:52:50 +00:00
parent 6957717a00
commit 9c2882d9e1
11 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/date.h
View File

@@ -179,11 +179,11 @@ public:
wxDate Previous(int dayOfWeek) const
{
wxDate prev = *this;
int dow = GetDayOfWeek();
if ( dayOfWeek <= dow )
return *this - (dow - dayOfWeek);
else
return *this - 7 + (dayOfWeek - dow);
prev -= dayOfWeek > dow ? 7 - (dayOfWeek - dow) : dow - dayOfWeek;
return prev;
}
wxString FormatDate(int type = -1) const

2
include/wx/datetime.h
View File

@@ -848,7 +848,7 @@ public:
// default to Today() otherwise)
const wxChar *ParseFormat(const wxChar *date,
const wxChar *format = _T("%c"),
const wxDateTime& dateDef = ms_InvDateTime);
const wxDateTime& dateDef = wxDateTime::ms_InvDateTime);
// parse a string containing the date/time in "free" format, this
// function will try to make an educated guess at the string contents
const wxChar *ParseDateTime(const wxChar *datetime);

8
include/wx/datetime.inl
View File

@@ -401,10 +401,10 @@ wxDateSpan::operator+=(const wxDateSpan& other)
wxDateSpan& wxDateSpan::Multiply(int factor)
{
m_years *= m_years;
m_months *= m_months;
m_weeks *= m_weeks;
m_days *= m_days;
m_years *= factor;
m_months *= factor;
m_weeks *= factor;
m_days *= factor;
return *this;
}

12
include/wx/longlong.h
View File

@@ -55,14 +55,10 @@
#error "See the documentation on the 'longlong' pragma."
#endif
#else // no native long long type
// we don't give warnings for the compilers we know about that they don't
// have any 64 bit integer type
#if 0 // !defined(__VISAGECPP__) && \
!defined(__VISUALC__) && \
!defined(__BORLANDC__)
#warning "Your compiler does not appear to support 64 bit integers, "\
"using emulation class instead."
#endif // known compilers without long long
// both warning and pragma warning are not portable, but at least an
// unknown pragma should never be an error
#pragma warning "Your compiler does not appear to support 64 bit "\
"integers, using emulation class instead."
#define wxUSE_LONGLONG_WX 1
#endif // compiler

6
src/common/datetime.cpp
View File

@@ -584,7 +584,6 @@ wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal)
{
case Gregorian:
return Now().GetMonth();
break;
case Julian:
wxFAIL_MSG(_T("TODO"));
@@ -612,7 +611,6 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal)
case Gregorian:
case Julian:
return IsLeapYear(year) ? 366 : 365;
break;
default:
wxFAIL_MSG(_T("unsupported calendar"));
@@ -1117,7 +1115,7 @@ wxDateTime& wxDateTime::Set(double jdn)
jdn *= MILLISECONDS_PER_DAY;
m_time = jdn;
m_time.Assign(jdn);
return *this;
}
@@ -1530,7 +1528,7 @@ wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(const TimeZone& tz) const
return week;
#else // this seems to be a bit simpler and I believe is also correct
return (WeekDay)((GetDayOfYear() - (GetWeekDay() - 1 + 7) % 7 + 7) / 7);
return (WeekDay)((GetDayOfYear(tz) - (GetWeekDay(tz) - 1 + 7) % 7 + 7) / 7);
#endif // 0/1
}

4
src/common/fileconf.cpp
View File

@@ -595,7 +595,7 @@ bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
{
if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
str = m_pCurrentGroup->Groups()[lIndex++]->Name();
str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
return TRUE;
}
else
@@ -611,7 +611,7 @@ bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
{
if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
str = m_pCurrentGroup->Entries()[lIndex++]->Name();
str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
return TRUE;
}
else

2
src/gtk/tbargtk.cpp
View File

@@ -407,7 +407,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
return TRUE;
}
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;

2
src/gtk/utilsres.cpp
View File

@@ -68,7 +68,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
conf.SetPath( section );
wxString result;
if (conf.Write( entry, &result ))
if (conf.Read( entry, &result ))
{
if (!result.IsEmpty())
{

2
src/gtk1/tbargtk.cpp
View File

@@ -407,7 +407,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
return TRUE;
}
bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;

2
src/gtk1/utilsres.cpp
View File

@@ -68,7 +68,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
conf.SetPath( section );
wxString result;
if (conf.Write( entry, &result ))
if (conf.Read( entry, &result ))
{
if (!result.IsEmpty())
{

4
src/unix/threadpsx.cpp
View File

@@ -725,7 +725,7 @@ void wxThreadInternal::Wait()
wxMutexGuiLeave();
bool isDetached = m_isDetached;
long id = GetId();
long id = (long)GetId();
wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
id);
@@ -749,7 +749,7 @@ void wxThreadInternal::Wait()
// we're cancelled inside pthread_join(), things will almost
// certainly break - but if we disable the cancellation, we
// might deadlock
if ( pthread_join(id, &m_exitcode) != 0 )
if ( pthread_join((pthread *)id, &m_exitcode) != 0 )
{
wxLogError(_("Failed to join a thread, potential memory leak "
"detected - please restart the program"));