X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5c3b53817d5b3a63513ae11e34a84d91aeb49f0..903f689bf7c3c379cba45881373aa9bdd15d6e70:/src/msw/notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 6bbc8d4fea..0e583d7f1f 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -9,12 +9,6 @@
 // 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
 // ============================================================================
@@ -49,6 +43,8 @@
   #error  "wxNotebook is not supported under Windows 3.1"
 #endif    //Win95
 
+#include  <windowsx.h>  // for SetWindowFont
+
 #ifdef __GNUWIN32__
   #include "wx/msw/gnuwin32/extra.h"
 #else   //!GnuWin32
@@ -165,6 +161,8 @@ bool wxNotebook::Create(wxWindow *parent,
     return FALSE;
   }
 
+  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+
   if ( parent != NULL ) 
     parent->AddChild(this);
   
@@ -351,18 +349,8 @@ bool wxNotebook::InsertPage(int nPage,
 // 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)
 {
-  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;
-  }
-
   // emulate page change (it's esp. important to do it first time because
   // otherwise our page would stay invisible)
   int nSel = m_nSelection;
@@ -444,8 +432,7 @@ void wxNotebook::Command(wxCommandEvent& event)
 
 bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 {
-  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 ) {
@@ -457,10 +444,17 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
       event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
       break;
 
+      // prevent this msg from being passed to wxControl::MSWNotify which would
+      // retrun FALSE disabling the change of page
+    case UDN_DELTAPOS:
+      return TRUE;
+
     default :
       return wxControl::MSWNotify(wParam, lParam);
   }
 
+  event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
+  event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   event.SetInt(LOWORD(wParam));
 
@@ -474,11 +468,13 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
-  wxASSERT( nOldSel != nSel ); // impossible
+  // 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;
 
-  if ( nOldSel != -1 ) {
+  if ( nOldSel != -1 )
     m_aPages[nOldSel]->Show(FALSE);
-  }
 
   wxNotebookPage *pPage = m_aPages[nSel];
   pPage->Show(TRUE);