no message

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 80dad3b71399abc2280945a537354132e3f874b6..742d04e8b9b9fe50583e736e5aad89fe03f2a5f9 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -9,22 +9,15 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
 #ifdef __GNUG__
-  #pragma implementation "notebook.h"
+#pragma implementation "notebook.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+#pragma hdrstop
 #endif
 
 // wxWindows
@@ -130,9 +123,6 @@ bool wxNotebook::Create(wxWindow *parent,
   m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
   m_foregroundColour = *wxBLACK ;
 
-  m_defaultForegroundColour = *wxBLACK ;
-  m_defaultBackgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
-
   // style
   m_windowStyle = style | wxTAB_TRAVERSAL;
 
@@ -161,7 +151,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);
@@ -194,7 +188,7 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(int nPage)
 {
-  wxASSERT( IS_VALID_PAGE(nPage) );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
 
   ChangePage(m_nSelection, nPage);
 
@@ -213,7 +207,7 @@ void wxNotebook::AdvanceSelection(bool bForward)
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
-  wxASSERT( IS_VALID_PAGE(nPage) );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;
@@ -224,7 +218,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
-  wxASSERT( IS_VALID_PAGE(nPage) );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), "", "notebook page out of range" );
 
   char buf[256];
   TC_ITEM tcItem;
@@ -241,7 +235,7 @@ wxString wxNotebook::GetPageText(int nPage) const
 
 int wxNotebook::GetPageImage(int nPage) const
 {
-  wxASSERT( IS_VALID_PAGE(nPage) );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;
@@ -251,7 +245,7 @@ int wxNotebook::GetPageImage(int nPage) const
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
-  wxASSERT( IS_VALID_PAGE(nPage) );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;
@@ -273,7 +267,7 @@ void wxNotebook::SetImageList(wxImageList* imageList)
 // remove one page from the notebook
 bool wxNotebook::DeletePage(int nPage)
 {
-  wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
 
   TabCtrl_DeleteItem(m_hwnd, nPage);