Further fixes to references

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 379f7dea9f80933c5b672547591471f3e2505aba..424201d9c643e79ee8b8afb8b738e6b7565cdabd 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -145,23 +145,22 @@ bool wxNotebook::Create(wxWindow *parent,
   if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
       return FALSE;
 
   if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
       return FALSE;
 

-  // colors and font
-  m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
-  m_foregroundColour = *wxBLACK;
+  parent->AddChild(this);

 
   // style
   m_windowStyle = style | wxTAB_TRAVERSAL;
 
 
   // style
   m_windowStyle = style | wxTAB_TRAVERSAL;
 

-  long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
+  long tabStyle = WS_TABSTOP | TCS_TABS;

 
 

+  if ( m_windowStyle & wxBORDER )
+    tabStyle |= WS_BORDER;

   if ( m_windowStyle & wxCLIP_SIBLINGS )
     tabStyle |= WS_CLIPSIBLINGS;
   if (m_windowStyle & wxCLIP_CHILDREN)
     tabStyle |= WS_CLIPCHILDREN;
   if ( m_windowStyle & wxCLIP_SIBLINGS )
     tabStyle |= WS_CLIPSIBLINGS;
   if (m_windowStyle & wxCLIP_CHILDREN)
     tabStyle |= WS_CLIPCHILDREN;

+

   if ( m_windowStyle & wxTC_MULTILINE )
     tabStyle |= TCS_MULTILINE;
   if ( m_windowStyle & wxTC_MULTILINE )
     tabStyle |= TCS_MULTILINE;

-  if ( m_windowStyle & wxBORDER )
-    tabStyle |= WS_BORDER;

   if (m_windowStyle & wxNB_FIXEDWIDTH)
     tabStyle |= TCS_FIXEDWIDTH ;
   if (m_windowStyle & wxNB_BOTTOM)
   if (m_windowStyle & wxNB_FIXEDWIDTH)
     tabStyle |= TCS_FIXEDWIDTH ;
   if (m_windowStyle & wxNB_BOTTOM)


@@ -171,19 +170,14 @@ bool wxNotebook::Create(wxWindow *parent,
   if (m_windowStyle & wxNB_RIGHT)
     tabStyle |= TCS_VERTICAL|TCS_RIGHT;
 
   if (m_windowStyle & wxNB_RIGHT)
     tabStyle |= TCS_VERTICAL|TCS_RIGHT;
 

-
-  if ( !MSWCreateControl(WC_TABCONTROL, tabStyle, pos, size) )
+  // note that we don't want to have the default WS_EX_CLIENTEDGE style for the
+  // notebook, so explicitly specify 0 as last parameter
+  if ( !MSWCreateControl(WC_TABCONTROL, tabStyle, pos, size, _T(""), 0) )

   {
     return FALSE;
   }
 
   {
     return FALSE;
   }
 

-  // Not all compilers recognise SetWindowFont
-  ::SendMessage(GetHwnd(), WM_SETFONT,
-                (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE);
-
-
-  if ( parent != NULL )
-    parent->AddChild(this);
+  SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));

 
   return TRUE;
 }
 
   return TRUE;
 }