Committing in .
Patches for VMS Temporarily patch to get the IMAGE sample compiled in MOTIF-mode N.B. GetSubImage still gives rubish Modified Files: wxWindows/setup.h_vms wxWindows/include/wx/motif/bitmap.h wxWindows/src/common/datetime.cpp wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms wxWindows/src/motif/bitmap.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1637,7 +1637,12 @@ 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
|
||||
if ( nWeek < 0 )
|
||||
#endif
|
||||
{
|
||||
// this may happen for January when Jan, 1 is the last week of the
|
||||
// previous year
|
||||
|
||||
@@ -48,6 +48,7 @@ OBJECTS = \
|
||||
docview.obj,\
|
||||
dynarray.obj,\
|
||||
dynlib.obj,\
|
||||
encconv.obj,\
|
||||
event.obj,\
|
||||
extended.obj,\
|
||||
ffile.obj,\
|
||||
@@ -145,6 +146,7 @@ SOURCES = \
|
||||
docview.cpp,\
|
||||
dynarray.cpp,\
|
||||
dynlib.cpp,\
|
||||
encconv.cpp,\
|
||||
event.cpp,\
|
||||
extended.c,\
|
||||
ffile.cpp,\
|
||||
@@ -266,6 +268,7 @@ docmdi.obj : docmdi.cpp
|
||||
docview.obj : docview.cpp
|
||||
dynarray.obj : dynarray.cpp
|
||||
dynlib.obj : dynlib.cpp
|
||||
encconv.obj : encconv.cpp
|
||||
event.obj : event.cpp
|
||||
extended.obj : extended.c
|
||||
ffile.obj : ffile.cpp
|
||||
|
||||
Reference in New Issue
Block a user