AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxBase compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-28 20:54:50 +00:00
parent a02dc3e3ff
commit 6dc6fda694
4 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/datetime.cpp
View File

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

5
src/common/objstrm.cpp
View File

@ -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

26
src/unix/mimetype.cpp
View File

@ -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"),

19
src/unix/utilsunx.cpp
View File

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