wxWindow::OnClose() removed completely from wxGTK, wxCloseEvent is now

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 6bbc8d4fea0a012d52ec792cbde0fe408d78d27e..34e0b589af998ad257ff1eb6b72cf8abf736f886 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -9,28 +9,15 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// TODO: 
-// 1) keyboard interface for changing pages ([Shift]+Ctrl-Tab)
-// 2) using OnSize() for showing pages for the first time works, but it surely
-//    us ugly
-// 3) I'm not sure that setting fonts works
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------

 #ifdef __GNUG__
 #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__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+#pragma hdrstop

 #endif
 
 // wxWindows
 #endif
 
 // wxWindows


@@ -40,18 +27,26 @@
 
 #include  <wx/log.h>
 #include  <wx/imaglist.h>
 
 #include  <wx/log.h>
 #include  <wx/imaglist.h>

+#include  <wx/event.h>
+#include  <wx/control.h>

 #include  <wx/notebook.h>
 
 #include  <wx/msw/private.h>
 
 // Windows standard headers
 #ifndef   __WIN95__
 #include  <wx/notebook.h>
 
 #include  <wx/msw/private.h>
 
 // Windows standard headers
 #ifndef   __WIN95__

-  #error  "wxNotebook is not supported under Windows 3.1"
+  #error  "wxNotebook is only supported Windows 95 and above"

 #endif    //Win95
 
 #endif    //Win95
 

+#include  <windowsx.h>  // for SetWindowFont
+
+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"
 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"

-#else   //!GnuWin32
+#endif
+#endif
+
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)

   #include <commctrl.h>
 #endif
 
   #include <commctrl.h>
 #endif
 


@@ -74,12 +69,13 @@
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)

+    EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)

     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)

-  IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
+  IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -134,11 +130,8 @@ bool wxNotebook::Create(wxWindow *parent,
   m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
   m_foregroundColour = *wxBLACK ;
 
   m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
   m_foregroundColour = *wxBLACK ;
 

-  m_defaultForegroundColour = *wxBLACK ;
-  m_defaultBackgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
-

   // style
   // style

-  m_windowStyle = style;
+  m_windowStyle = style | wxTAB_TRAVERSAL;

 
   long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
   if ( m_windowStyle & wxTC_MULTILINE )
 
   long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
   if ( m_windowStyle & wxTC_MULTILINE )


@@ -165,6 +158,12 @@ bool wxNotebook::Create(wxWindow *parent,
     return FALSE;
   }
 
     return 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);
   
   if ( parent != NULL ) 
     parent->AddChild(this);
   


@@ -196,7 +195,7 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(int nPage)
 {
 
 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);
 
 
   ChangePage(m_nSelection, nPage);
 


@@ -215,7 +214,7 @@ void wxNotebook::AdvanceSelection(bool bForward)
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
 
 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;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;


@@ -226,7 +225,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
 
 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;
 
   char buf[256];
   TC_ITEM tcItem;


@@ -243,7 +242,7 @@ wxString wxNotebook::GetPageText(int nPage) const
 
 int wxNotebook::GetPageImage(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;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;


@@ -253,7 +252,7 @@ int wxNotebook::GetPageImage(int nPage) const
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
 
 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;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;


@@ -275,7 +274,7 @@ void wxNotebook::SetImageList(wxImageList* imageList)
 // remove one page from the notebook
 bool wxNotebook::DeletePage(int nPage)
 {
 // 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);
 
 
   TabCtrl_DeleteItem(m_hwnd, nPage);
 


@@ -285,6 +284,18 @@ bool wxNotebook::DeletePage(int nPage)
   return TRUE;
 }
 
   return TRUE;
 }
 

+// remove one page from the notebook, without deleting
+bool wxNotebook::RemovePage(int nPage)
+{
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+
+  TabCtrl_DeleteItem(m_hwnd, nPage);
+
+  m_aPages.Remove(nPage);
+
+  return TRUE;
+}
+

 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {


@@ -351,32 +362,24 @@ bool wxNotebook::InsertPage(int nPage,
 // wxNotebook callbacks
 // ----------------------------------------------------------------------------
 
 // wxNotebook callbacks
 // ----------------------------------------------------------------------------
 

-// @@@ OnSize() is used for setting the font when it's called for the first
-//     time because doing it in ::Create() doesn't work (for unknown reasons)

 void wxNotebook::OnSize(wxSizeEvent& event)
 {
 void wxNotebook::OnSize(wxSizeEvent& event)
 {

-  static bool s_bFirstTime = TRUE;
-  if ( s_bFirstTime ) {
-    SendMessage((HWND)m_hwnd, WM_SETFONT,
-                (WPARAM)GetStockObject(DEFAULT_GUI_FONT),
-                MAKELPARAM(TRUE, 0));
-    s_bFirstTime = FALSE;
+  // make sure the current page is shown and has focus (it's useful because all
+  // pages are created invisible initially)
+  if ( m_nSelection != -1 ) {
+    wxNotebookPage *pPage = m_aPages[m_nSelection];
+    pPage->Show(TRUE);
+    pPage->SetFocus();

   }
 
   }
 

-  // emulate page change (it's esp. important to do it first time because
-  // otherwise our page would stay invisible)
-  int nSel = m_nSelection;
-  m_nSelection = -1;
-  SetSelection(nSel);
-

   // fit the notebook page to the tab control's display area
   RECT rc;
   rc.left = rc.top = 0;
   GetSize((int *)&rc.right, (int *)&rc.bottom);
 
   TabCtrl_AdjustRect(m_hwnd, FALSE, &rc);
   // fit the notebook page to the tab control's display area
   RECT rc;
   rc.left = rc.top = 0;
   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() )
     wxNotebookPage *pPage = m_aPages[nPage];
     pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
     if ( pPage->GetAutoLayout() )


@@ -415,7 +418,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
     // pass to the parent
     if ( GetParent() ) {
       event.SetCurrentFocus(this);
     // pass to the parent
     if ( GetParent() ) {
       event.SetCurrentFocus(this);

-      GetParent()->ProcessEvent(event);
+      GetParent()->GetEventHandler()->ProcessEvent(event);

     }
   }
 }
     }
   }
 }


@@ -442,10 +445,9 @@ void wxNotebook::Command(wxCommandEvent& event)
   wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 
   wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 

-bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)

 {
 {

-  wxNotebookEvent event(wxEVT_NULL, m_windowId, 
-                        TabCtrl_GetCurSel(m_hwnd), m_nSelection);
+  wxNotebookEvent event(wxEVT_NULL, m_windowId);

 
   NMHDR* hdr = (NMHDR *)lParam;
   switch ( hdr->code ) {
 
   NMHDR* hdr = (NMHDR *)lParam;
   switch ( hdr->code ) {


@@ -457,14 +459,18 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
       event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
       break;
 
       event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
       break;
 

-    default :
-      return wxControl::MSWNotify(wParam, lParam);
+    default:
+      return wxControl::MSWNotify(wParam, lParam, result);

   }
 
   }
 

+  event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
+  event.SetOldSelection(m_nSelection);

   event.SetEventObject(this);
   event.SetEventObject(this);

-  event.SetInt(LOWORD(wParam));
+  event.SetInt(LOWORD(wParam)); // ctrl id

 
 

-  return ProcessEvent(event);
+  bool processed = GetEventHandler()->ProcessEvent(event);
+  *result = !event.IsAllowed();
+  return processed;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -474,15 +480,48 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {

-  wxASSERT( nOldSel != nSel ); // impossible
+  // MT-FIXME should use a real semaphore
+  static bool s_bInsideChangePage = FALSE;

 
 

-  if ( nOldSel != -1 ) {
-    m_aPages[nOldSel]->Show(FALSE);
+  // when we call ProcessEvent(), our own OnSelChange() is called which calls
+  // this function - break the infinite loop
+  if ( s_bInsideChangePage )
+    return;
+
+  // it's not an error (the message may be generated by the tab control itself)
+  // and it may happen - just do nothing
+  if ( nSel == nOldSel )
+    return;
+
+  s_bInsideChangePage = TRUE;
+
+  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+  event.SetSelection(nSel);
+  event.SetOldSelection(nOldSel);
+  event.SetEventObject(this);
+  if ( ProcessEvent(event) && !event.IsAllowed() )
+  {
+    // program doesn't allow the page change
+    s_bInsideChangePage = FALSE;
+    return;

   }
 
   }
 

+  if ( nOldSel != -1 )
+    m_aPages[nOldSel]->Show(FALSE);
+

   wxNotebookPage *pPage = m_aPages[nSel];
   pPage->Show(TRUE);
   pPage->SetFocus();
 
   wxNotebookPage *pPage = m_aPages[nSel];
   pPage->Show(TRUE);
   pPage->SetFocus();
 

+  event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+  ProcessEvent(event);
+

   m_nSelection = nSel;
   m_nSelection = nSel;

+  s_bInsideChangePage = FALSE;

 }
 }

+
+void wxNotebook::OnEraseBackground(wxEraseEvent& event)
+{
+    Default();
+}
+