WinCE build fix.

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 6f9d82c34c6470168d9904ca752d5d86e8391600..9134dfc3e0d0a0f9246866da332a7786f791545d 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -799,7 +799,9 @@ bool wxNotebook::InsertPage(size_t nPage,
     // so the first panel gets the correct themed background
     if ( m_pages.empty() )
     {
     // so the first panel gets the correct themed background
     if ( m_pages.empty() )
     {

+#if wxUSE_UXTHEME

         UpdateBgBrush();
         UpdateBgBrush();

+#endif // wxUSE_UXTHEME

     }
 
     // succeeded: save the pointer to the page
     }
 
     // succeeded: save the pointer to the page

diff --git a/src/msw/wince/time.cpp b/src/msw/wince/time.cpp
index 965502e15b724fc12bbd68978ffbdcac23ead98c..d53f58b69faf136658686accfc632cd25fceeec6 100644 (file)
--- a/src/msw/wince/time.cpp
+++ b/src/msw/wince/time.cpp
@@ -4,7 +4,7 @@
 // Author:      Marco Cavallini (MCK) - wx@koansoftware.com
 // Modified by:
 // Created:     31-08-2003
 // Author:      Marco Cavallini (MCK) - wx@koansoftware.com
 // Modified by:
 // Created:     31-08-2003

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) Marco Cavallini
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Marco Cavallini
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -510,7 +510,7 @@ size_t wcsftime(wchar_t *s,
     wxString formatStr(format);
     wxCharBuffer bufFormatStr(formatStr.mb_str());
 
     wxString formatStr(format);
     wxCharBuffer bufFormatStr(formatStr.mb_str());
 

-    size_t sz = strftime(sBuf, maxsize/sizeof(wchar_t), bufFormatStr, t);
+    size_t sz = strftime(sBuf.data(), maxsize/sizeof(wchar_t), bufFormatStr, t);

 
     wxMB2WC(s, sBuf, maxsize);
 
 
     wxMB2WC(s, sBuf, maxsize);