Misc. fixes for obscure compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
a2327a9f80
commit
3e0b743f1d
@ -3550,3 +3550,5 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
|
||||
|
||||
return holidays.GetCount();
|
||||
}
|
||||
|
||||
|
||||
|
@ -129,7 +129,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
|
||||
wxPoint pt(0, 0);
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
if ( GetToolBar() )
|
||||
if ( GetToolBar() && GetToolBar()->IsShown() )
|
||||
{
|
||||
int w, h;
|
||||
GetToolBar()->GetSize(& w, & h);
|
||||
|
@ -258,7 +258,7 @@ wxLongLong wxGetLocalTimeMillis()
|
||||
return (val + tp.millitm);
|
||||
}
|
||||
#else
|
||||
#ifndef __BORLANDC__
|
||||
#if !defined(__BORLANDC__) && !(defined(__VISUALC__) && defined(__WIN16__))
|
||||
#warning "wxStopWatch will be up to second resolution!"
|
||||
#endif
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user