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

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

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);

include/wx/datetime.inl

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

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
+    // both warning and pragma warning are not portable, but at least an
-    // have any 64 bit integer type
+    // unknown pragma should never be an error
-    #if 0 // !defined(__VISAGECPP__) && \
+    #pragma warning "Your compiler does not appear to support 64 bit "\
-        !defined(__VISUALC__) && \
+                    "integers, using emulation class instead."
-        !defined(__BORLANDC__)
-        #warning "Your compiler does not appear to support 64 bit integers, "\
-                 "using emulation class instead."
-    #endif // known compilers without long long
 
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler

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;
+            time2 = (int) time;
-	   if ( time2 >= 0 )
+            if ( time2 >= 0 )
 #else
-	   if ( time >= 0 )
+            if ( time >= 0 )
 #endif
             {
                 tm = gmtime(&time);

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

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;
 

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() );
+            wxStrcpy( s, result.c_str() );
-	    *value = s;
+            *value = s;
-	    return TRUE;
+            return TRUE;
-	}
+        }
     }
-    
+
     return FALSE;
 }
 

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;
 

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() );
+            wxStrcpy( s, result.c_str() );
-	    *value = s;
+            *value = s;
-	    return TRUE;
+            return TRUE;
-	}
+        }
     }
-    
+
     return FALSE;
 }
 

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"));