Misc. fixes for obscure compilers

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 04fac9daaf512a348d180a1345e8a7d02e599566..eafbeeb5863cedd1db4bf5f3ddc309b419878eb0 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3550,3 +3550,5 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
 
     return holidays.GetCount();
 }
 
     return holidays.GetCount();
 }

+
+

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index c2f9f21f046c6cc4322b748eb289085e9c3f94cc..ef3ab1defcbbdf4aa43e7caa4d32c0beb2a12c75 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -129,7 +129,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
     wxPoint pt(0, 0);
 
 #if wxUSE_TOOLBAR
     wxPoint pt(0, 0);
 
 #if wxUSE_TOOLBAR

-    if ( GetToolBar() )
+    if ( GetToolBar() && GetToolBar()->IsShown() )

     {
         int w, h;
         GetToolBar()->GetSize(& w, & h);
     {
         int w, h;
         GetToolBar()->GetSize(& w, & h);

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index f6b77360a9b5dc054f7a1394f1890e97124f43a9..000226700f874ea898d0e11cf711fb29c91169b2 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -258,7 +258,7 @@ wxLongLong wxGetLocalTimeMillis()
         return (val + tp.millitm);
     }
 #else
         return (val + tp.millitm);
     }
 #else

-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) && !(defined(__VISUALC__) && defined(__WIN16__))

     #warning "wxStopWatch will be up to second resolution!"
 #endif
 #endif
     #warning "wxStopWatch will be up to second resolution!"
 #endif
 #endif