From: Włodzimierz Skiba Date: Fri, 18 Jun 2004 09:48:15 +0000 (+0000) Subject: Warning fixes for WinCE. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/991420e6df6aaf452a0d27851d437c306a31c865 Warning fixes for WinCE. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c index 363eabc409..4d6e01f624 100644 --- a/src/msw/gsocket.c +++ b/src/msw/gsocket.c @@ -27,13 +27,17 @@ # pragma warning(disable:4100) #ifdef __WXWINCE__ - /* - "unreferenced inline function has been removed": this is not - suppressed by push above as it is given at the end of the - compilation unit - */ -# pragma warning(disable:4514) -#endif /* __WXWINCE__ */ + /* windows.h results in tons of warnings at max warning level */ +# ifdef _MSC_VER +# pragma warning(push, 1) +# endif +# include +# ifdef _MSC_VER +# pragma warning(pop) +# pragma warning(disable:4514) +# endif +#endif + #endif /* _MSC_VER */ #include @@ -780,7 +784,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) FD_ZERO(&writefds); FD_ZERO(&exceptfds); FD_SET(socket->m_fd, &readfds); - if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) + if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) FD_SET(socket->m_fd, &writefds); FD_SET(socket->m_fd, &exceptfds); @@ -799,7 +803,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) /* Try select now */ if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, - &socket->m_timeout) <= 0) + &socket->m_timeout) <= 0) { /* What to do here? */ return (result & flags); diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index 6a4ead800b..8e75239ea5 100644 --- a/src/msw/gsockmsw.c +++ b/src/msw/gsockmsw.c @@ -35,16 +35,11 @@ /* windows.h results in tons of warnings at max warning level */ # ifdef _MSC_VER # pragma warning(push, 1) - /* - "unreferenced inline function has been removed": this is not - suppressed by push above as it is given at the end of the - compilation unit - */ -# pragma warning(disable:4514) # endif # include # ifdef _MSC_VER # pragma warning(pop) +# pragma warning(disable:4514) # endif #endif diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index f42510697a..c8966ad7bb 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -420,10 +420,11 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title, #if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \ defined(__POCKETPC__) || \ defined(__SMARTPHONE__)) - // Always expand to fit the screen in PocketPC or SmartPhone - wxSize sz(wxDefaultSize); + // Always expand to fit the screen in PocketPC or SmartPhone + wxSize sz(wxDefaultSize); + wxUnusedVar(size); #else // other (including normal desktop) Windows - wxSize sz(size); + wxSize sz(size); #endif return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); @@ -519,12 +520,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, ); } - // Native look is full screen window on Smartphones and Standard SDK + // Native look is full screen window on Smartphones and Standard SDK #if defined(__WXWINCE__) if ( style & wxMAXIMIZE ) - { - this->Maximize(); - } + { + this->Maximize(); + } #endif #ifdef __SMARTPHONE__ @@ -576,9 +577,9 @@ bool wxTopLevelWindowMSW::Show(bool show) // show and maximize nShowCmd = SW_MAXIMIZE; - // This is necessary, or no window appears + // This is necessary, or no window appears #ifdef __WINCE_STANDARDSDK__ - DoShowWindow(SW_SHOW); + DoShowWindow(SW_SHOW); #endif m_maximizeOnShow = FALSE; diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 5ec9958cf7..844c422ab0 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -918,11 +918,12 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), wxToolBarToolBase *tool = FindById(id); if ( !tool ) - return FALSE; + return false; return HandleTooltipNotify(code, lParam, tool->GetShortHelp()); #else - return FALSE; + wxUnusedVar(lParam); + return false; #endif } @@ -1133,7 +1134,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event) } } -void wxToolBar::HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam) +void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam) { wxCoord x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp index b512e22ec7..b09a02603d 100644 --- a/src/msw/wince/time.cpp +++ b/src/msw/wince/time.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 31-08-2003 // RCS-ID: -// Copyright: (c) Marco Cavallini +// Copyright: (c) Marco Cavallini // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -36,65 +36,65 @@ #include #define is_leap(y) (y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)) -#define SECONDS_IN_ONE_MINUTE 60 -#define DAYS_IN_ONE_YEAR 365 -#define SECONDS_IN_ONE_MIN 60 -#define SECONDS_IN_ONE_HOUR 3600 -#define SECONDS_IN_ONE_DAY 86400 -#define DEFAULT_TIMEZONE 28800 -#define DO_GMTIME 0 -#define DO_LOCALTIME 1 +#define SECONDS_IN_ONE_MINUTE 60 +#define DAYS_IN_ONE_YEAR 365 +#define SECONDS_IN_ONE_MIN 60 +#define SECONDS_IN_ONE_HOUR 3600 +#define SECONDS_IN_ONE_DAY 86400 +#define DEFAULT_TIMEZONE 28800 +#define DO_GMTIME 0 +#define DO_LOCALTIME 1 -long timezone ; // global variable +long timezone ; // global variable //////////////////////////////////////////////////////////////////////// // Common code for localtime and gmtime (static) //////////////////////////////////////////////////////////////////////// -static struct tm * __cdecl common_localtime(const time_t * t, BOOL bLocal) +static struct tm * __cdecl common_localtime(const time_t * WXUNUSED(t), BOOL bLocal) { - wxString str ; - SYSTEMTIME SystemTime; - TIME_ZONE_INFORMATION pTz; - static struct tm st_res ; // data holder - static struct tm * res = &st_res ; // data pointer - int iLeap; - const unsigned short int __mon_yday[2][13] = - { - // Normal years - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - // Leap years - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; - - ::GetLocalTime(&SystemTime) ; - ::GetTimeZoneInformation(&pTz); - - /////////////////////////////////////////////// - // Set timezone - timezone = pTz.Bias * SECONDS_IN_ONE_MINUTE ; - /////////////////////////////////////////////// - - iLeap = is_leap(SystemTime.wYear) ; - - res->tm_hour = SystemTime.wHour; - res->tm_min = SystemTime.wMinute; - res->tm_sec = SystemTime.wSecond; - - res->tm_mday = SystemTime.wDay; - res->tm_mon = SystemTime.wMonth - 1;// this the correct month but localtime returns month aligned to zero - res->tm_year = SystemTime.wYear; // this the correct year - res->tm_year = res->tm_year - 1900; // but localtime returns the value starting at the 1900 - - res->tm_wday = SystemTime.wDayOfWeek; - res->tm_yday = __mon_yday[iLeap][res->tm_mon] + SystemTime.wDay - 1; // localtime returns year-day aligned to zero - - // if localtime behavior and daylight saving - if (bLocal && pTz.DaylightBias != 0) - res->tm_isdst = 1; - else - res->tm_isdst = 0; // without daylight saving or gmtime + wxString str ; + SYSTEMTIME SystemTime; + TIME_ZONE_INFORMATION pTz; + static struct tm st_res ; // data holder + static struct tm * res = &st_res ; // data pointer + int iLeap; + const unsigned short int __mon_yday[2][13] = + { + // Normal years + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + // Leap years + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + }; + + ::GetLocalTime(&SystemTime) ; + ::GetTimeZoneInformation(&pTz); + + /////////////////////////////////////////////// + // Set timezone + timezone = pTz.Bias * SECONDS_IN_ONE_MINUTE ; + /////////////////////////////////////////////// + + iLeap = is_leap(SystemTime.wYear) ; + + res->tm_hour = SystemTime.wHour; + res->tm_min = SystemTime.wMinute; + res->tm_sec = SystemTime.wSecond; + + res->tm_mday = SystemTime.wDay; + res->tm_mon = SystemTime.wMonth - 1; // this the correct month but localtime returns month aligned to zero + res->tm_year = SystemTime.wYear; // this the correct year + res->tm_year = res->tm_year - 1900; // but localtime returns the value starting at the 1900 + + res->tm_wday = SystemTime.wDayOfWeek; + res->tm_yday = __mon_yday[iLeap][res->tm_mon] + SystemTime.wDay - 1; // localtime returns year-day aligned to zero + + // if localtime behavior and daylight saving + if (bLocal && pTz.DaylightBias != 0) + res->tm_isdst = 1; + else + res->tm_isdst = 0; // without daylight saving or gmtime return res; } @@ -105,7 +105,7 @@ static struct tm * __cdecl common_localtime(const time_t * t, BOOL bLocal) //////////////////////////////////////////////////////////////////////// struct tm * __cdecl localtime(const time_t * t) { - return common_localtime(t, DO_LOCALTIME) ; + return common_localtime(t, DO_LOCALTIME) ; } //////////////////////////////////////////////////////////////////////// @@ -114,7 +114,7 @@ struct tm * __cdecl localtime(const time_t * t) //////////////////////////////////////////////////////////////////////// struct tm * __cdecl gmtime(const time_t *t) { - return common_localtime(t, DO_GMTIME) ; + return common_localtime(t, DO_GMTIME) ; } @@ -123,26 +123,26 @@ struct tm * __cdecl gmtime(const time_t *t) //////////////////////////////////////////////////////////////////////// static time_t __cdecl common_tm_to_time(int day, int month, int year, int hour, int minute, int second) { - time_t prog = 0 ; - static int mdays[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 } ; - - while (--month) - { - prog += mdays[month - 1] ; - if (month == 2 && is_leap(year)) - prog++ ; - } - - // Calculate seconds in elapsed days - prog = day - 1 ; // align first day of the year to zero - prog += (DAYS_IN_ONE_YEAR * (year - 1970) + (year - 1901) / 4 - 19) ; - prog *= SECONDS_IN_ONE_DAY ; - - // Add Calculated elapsed seconds in the current day - prog += (hour * SECONDS_IN_ONE_HOUR + minute * - SECONDS_IN_ONE_MIN + second) ; - - return prog ; + time_t prog = 0 ; + static int mdays[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 } ; + + while (--month) + { + prog += mdays[month - 1] ; + if (month == 2 && is_leap(year)) + prog++ ; + } + + // Calculate seconds in elapsed days + prog = day - 1 ; // align first day of the year to zero + prog += (DAYS_IN_ONE_YEAR * (year - 1970) + (year - 1901) / 4 - 19) ; + prog *= SECONDS_IN_ONE_DAY ; + + // Add Calculated elapsed seconds in the current day + prog += (hour * SECONDS_IN_ONE_HOUR + minute * + SECONDS_IN_ONE_MIN + second) ; + + return prog ; } @@ -152,19 +152,19 @@ static time_t __cdecl common_tm_to_time(int day, int month, int year, int hour, //////////////////////////////////////////////////////////////////////// time_t __cdecl time(time_t *t) { - time_t prog = 0 ; + time_t prog = 0 ; - if (t != NULL) - { - SYSTEMTIME SystemTime; + if (t != NULL) + { + SYSTEMTIME SystemTime; - ::GetLocalTime(&SystemTime) ; - prog = common_tm_to_time(SystemTime.wDay, SystemTime.wMonth, SystemTime.wYear, - SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond) ; - *t = prog ; - } + ::GetLocalTime(&SystemTime) ; + prog = common_tm_to_time(SystemTime.wDay, SystemTime.wMonth, SystemTime.wYear, + SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond) ; + *t = prog ; + } - return prog ; + return prog ; } //////////////////////////////////////////////////////////////////////// @@ -173,7 +173,7 @@ time_t __cdecl time(time_t *t) //////////////////////////////////////////////////////////////////////// time_t __cdecl mktime(struct tm *t) { - return (common_tm_to_time(t->tm_mday, t->tm_mon+1, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec)) ; + return (common_tm_to_time(t->tm_mday, t->tm_mon+1, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec)) ; } diff --git a/src/msw/window.cpp b/src/msw/window.cpp index a45b129a45..6e5aed096f 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -4710,6 +4710,9 @@ int wxWindowMSW::HandleMenuChar(int chAccel, WXLPARAM lParam) wxLogLastError(_T("GetMenuItemInfo")); } } +#else + wxUnusedVar(chAccel); + wxUnusedVar(lParam); #endif return wxNOT_FOUND; } @@ -4798,6 +4801,10 @@ bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags) return GetEventHandler()->ProcessEvent(event); #else + wxUnusedVar(msg); + wxUnusedVar(x); + wxUnusedVar(y); + wxUnusedVar(flags); return false; #endif }