wxBase compilation fixes

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index b2f65e9f618c5158641d22d4d269aa0a77a60113..b24efdb41f5e46504b1a12206994fb90addcfc00 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -1641,20 +1641,15 @@ wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
 {
     Tm tm = GetTm(tz);
     wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year);
-    size_t nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
-#ifdef __VMS__ // nWeek is unsigned so avoid the warning
-   int nweek2 = (int) nWeek;
-   if ( nweek2 < 0 )
-#else
+    int nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1;
     if ( nWeek < 0 )
-#endif
     {
         // this may happen for January when Jan, 1 is the last week of the
         // previous year
         nWeek += IsLeapYear(tm.year - 1) ? 53 : 52;
     }
 
-    return nWeek;
+    return (wxDateTime::wxDateTime_t)nWeek;
 }
 
 wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
@@ -3486,9 +3481,9 @@ wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
     holidays.Empty();
 
     size_t count = ms_authorities.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    for ( size_t nAuth = 0; nAuth < count; nAuth++ )
     {
-        ms_authorities[n]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
+        ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
 
         WX_APPEND_ARRAY(holidays, hol);
     }

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index 0488a6b90d3c7a46106de747988e2f858f92675b..e0156b200dd51ba569bc88bb5c04f5b88b5621e8 100644 (file)
--- a/src/common/objstrm.cpp
+++ b/src/common/objstrm.cpp
@@ -8,8 +8,9 @@
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
+
 #ifdef __GNUG__
-#pragma implementation "objstrm.h"
+    #pragma implementation "objstrm.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -321,5 +322,5 @@ wxObject *wxObjectInputStream::LoadObject()
   return object;
 }
 
-#endif
+#endif // wxUSE_SERIAL && wxUSE_STREAMS
 

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 8130ffda6ee7db69aeb9287c3474c3f5c8efb169..aa0fc4f3de9be44e6b3f855612f38367773037e3 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -560,8 +560,14 @@ void wxGNOMEIconHandler::GetMimeInfoRecords(wxMimeTypesManagerImpl *manager)
     }
 }
 
+#if wxUSE_GUI
+    #define WXUNUSED_UNLESS_GUI(p)  p
+#else
+    #define WXUNUSED_UNLESS_GUI(p)
+#endif
 
-bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
+bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype,
+                                 wxIcon * WXUNUSED_UNLESS_GUI(icon))
 {
     if ( !m_inited )
     {
@@ -581,8 +587,11 @@ bool wxGNOMEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
         icn = wxIcon(iconname);
     else
         icn = wxIcon(iconname, wxBITMAP_TYPE_ANY);
-    if (icn.Ok()) *icon = icn;
-    else return FALSE;
+    if ( !icn.Ok() )
+        return FALSE;
+
+    if ( icon )
+        *icon = icn;
 #else
     // helpful for testing in console mode
     wxLogDebug(_T("Found GNOME icon for '%s': '%s'\n"),
@@ -801,7 +810,8 @@ void wxKDEIconHandler::Init()
     m_inited = TRUE;
 }
 
-bool wxKDEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
+bool wxKDEIconHandler::GetIcon(const wxString& mimetype,
+                               wxIcon * WXUNUSED_UNLESS_GUI(icon))
 {
     if ( !m_inited )
     {
@@ -821,8 +831,12 @@ bool wxKDEIconHandler::GetIcon(const wxString& mimetype, wxIcon *icon)
         icn = wxIcon(iconname);
     else
         icn = wxIcon(iconname, wxBITMAP_TYPE_ANY);
-    if (icn.Ok()) *icon = icn;
-    else return FALSE;
+
+    if ( !icn.Ok() )
+        return FALSE;
+
+    if ( icon )
+        *icon = icn;
 #else
     // helpful for testing in console mode
     wxLogDebug(_T("Found KDE icon for '%s': '%s'\n"),

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 2efc806bd1a2a9c7be983f008a78915fa4c541aa..3b09340becb2edae82448469af9a0f83d3973a86 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -25,7 +25,9 @@
 #include "wx/process.h"
 #include "wx/thread.h"
 
-#include "wx/unix/execute.h"
+#if wxUSE_GUI
+    #include "wx/unix/execute.h"
+#endif
 
 #include <stdarg.h>
 #include <dirent.h>
@@ -212,6 +214,8 @@ bool wxShell(const wxString& command)
     return wxExecute(cmd) != 0;
 }
 
+#if wxUSE_GUI
+
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
     int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
@@ -262,7 +266,17 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
 }
 
-long wxExecute( wxChar **argv, bool sync, wxProcess *process )
+#endif // wxUSE_GUI
+
+#if wxUSE_GUI
+    #define WXUNUSED_UNLESS_GUI(p)  p
+#else
+    #define WXUNUSED_UNLESS_GUI(p)
+#endif
+
+long wxExecute(wxChar **argv,
+               bool sync,
+               wxProcess * WXUNUSED_UNLESS_GUI(process))
 {
     wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") );
 
@@ -364,7 +378,6 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
 #if wxUSE_GUI
         wxEndProcessData *data = new wxEndProcessData;
 
-
         ARGS_CLEANUP;
 
         if ( sync )