Removed warnings

[wxWidgets.git] / src / msw / notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 0e583d7f1fc3f8a3005902dfdd7a956c6c81f091..6bded92b0f71bfd69dbd80199fb6757d3849e527 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -134,7 +134,7 @@ bool wxNotebook::Create(wxWindow *parent,
   m_defaultBackgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
 
   // style
-  m_windowStyle = style;
+  m_windowStyle = style | wxTAB_TRAVERSAL;
 
   long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
   if ( m_windowStyle & wxTC_MULTILINE )
@@ -161,7 +161,11 @@ bool wxNotebook::Create(wxWindow *parent,
     return FALSE;
   }
 
-  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+  // Not all compilers recognise SetWindowFont
+//  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+  ::SendMessage((HWND) m_hwnd, WM_SETFONT,
+                  (WPARAM)::GetStockObject(DEFAULT_GUI_FONT),TRUE);
+
 
   if ( parent != NULL ) 
     parent->AddChild(this);
@@ -363,8 +367,8 @@ void wxNotebook::OnSize(wxSizeEvent& event)
   GetSize((int *)&rc.right, (int *)&rc.bottom);
 
   TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
-  uint nCount = m_aPages.Count();
-  for ( uint nPage = 0; nPage < nCount; nPage++ ) {
+  size_t nCount = m_aPages.Count();
+  for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
     wxNotebookPage *pPage = m_aPages[nPage];
     pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
     if ( pPage->GetAutoLayout() )