From 9c2882d9e1b17c600a196e1b69fbe66b98204151 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 26 Dec 1999 21:52:50 +0000 Subject: [PATCH] 1. misc compilation (errors, warnings) fixes (from the build logs) 2. fixed a bug in wxGTK::wxGetResource git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/date.h | 8 ++++---- include/wx/datetime.h | 2 +- include/wx/datetime.inl | 8 ++++---- include/wx/longlong.h | 12 ++++-------- src/common/datetime.cpp | 12 +++++------- src/common/fileconf.cpp | 4 ++-- src/gtk/tbargtk.cpp | 2 +- src/gtk/utilsres.cpp | 20 ++++++++++---------- src/gtk1/tbargtk.cpp | 2 +- src/gtk1/utilsres.cpp | 20 ++++++++++---------- src/unix/threadpsx.cpp | 4 ++-- 11 files changed, 44 insertions(+), 50 deletions(-) diff --git a/include/wx/date.h b/include/wx/date.h index d4dd19c745..1b3f2e7788 100644 --- a/include/wx/date.h +++ b/include/wx/date.h @@ -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 diff --git a/include/wx/datetime.h b/include/wx/datetime.h index d0de3f9773..a41287b335 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -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); diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl index 8be3bf69b2..9c0dec16a3 100644 --- a/include/wx/datetime.inl +++ b/include/wx/datetime.inl @@ -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; } diff --git a/include/wx/longlong.h b/include/wx/longlong.h index c9fca339ef..4fd611a710 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -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 diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 8cd374b31f..93682aaca7 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -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 } @@ -1673,10 +1671,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const time += tz.GetOffset(); #ifdef __VMS__ /* time is unsigned so VMS gives a warning on the original */ - time2 = (int) time; - if ( time2 >= 0 ) + time2 = (int) time; + if ( time2 >= 0 ) #else - if ( time >= 0 ) + if ( time >= 0 ) #endif { tm = gmtime(&time); diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 54bc21641a..49f6127500 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -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 diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index c6961b6381..5cbd3c990e 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -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; diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp index cf8a946da7..749a722e1d 100644 --- a/src/gtk/utilsres.cpp +++ b/src/gtk/utilsres.cpp @@ -62,23 +62,23 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value, { wxString filename( file ); if (filename.IsEmpty()) filename = wxT(".wxWindows"); - + wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); - + conf.SetPath( section ); - + wxString result; - if (conf.Write( entry, &result )) + if (conf.Read( entry, &result )) { if (!result.IsEmpty()) - { + { char *s = new char[result.Len()+1]; - wxStrcpy( s, result.c_str() ); - *value = s; - return TRUE; - } + wxStrcpy( s, result.c_str() ); + *value = s; + return TRUE; + } } - + return FALSE; } diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index c6961b6381..5cbd3c990e 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -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; diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp index cf8a946da7..749a722e1d 100644 --- a/src/gtk1/utilsres.cpp +++ b/src/gtk1/utilsres.cpp @@ -62,23 +62,23 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value, { wxString filename( file ); if (filename.IsEmpty()) filename = wxT(".wxWindows"); - + wxFileConfig conf( wxTheApp->GetAppName(), wxTheApp->GetVendorName(), filename ); - + conf.SetPath( section ); - + wxString result; - if (conf.Write( entry, &result )) + if (conf.Read( entry, &result )) { if (!result.IsEmpty()) - { + { char *s = new char[result.Len()+1]; - wxStrcpy( s, result.c_str() ); - *value = s; - return TRUE; - } + wxStrcpy( s, result.c_str() ); + *value = s; + return TRUE; + } } - + return FALSE; } diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index c0a1a533a8..d708dbd703 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -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")); -- 2.45.2