now process UDN_DELTAPOS notification: up-down control (which appears if there

is not enough space for the pages) works correctly now


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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,10 @@ bool wxNotebook::Create(wxWindow *parent,
     return FALSE;
   }
 
+  // @@@ this crashes the application with "Invalid instruction" exception
+  //     deep inside Windows -- why???
+  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
+
   if ( parent != NULL ) 
     parent->AddChild(this);
   
@@ -351,18 +351,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;
@@ -457,6 +447,12 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
       event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
       break;
 
+      // if we don't intercept it here this message is passed to our parent (if
+      // we have one) and then lost in it's DefWindowProc
+    case UDN_DELTAPOS:
+      MSWDefWindowProc(WM_NOTIFY, wParam, lParam);
+      return TRUE;
+
     default :
       return wxControl::MSWNotify(wParam, lParam);
   }
@@ -474,11 +470,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);