argc == 0 bug fixed

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 04278992fb676140853980076033de2df3121e0c..34e0b589af998ad257ff1eb6b72cf8abf736f886 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -27,20 +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
 
 #include  <windowsx.h>  // for SetWindowFont
 
 #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
 


@@ -69,7 +75,7 @@
   END_EVENT_TABLE()
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
   END_EVENT_TABLE()
 
   IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)

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

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


@@ -278,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()
 {


@@ -346,11 +364,13 @@ bool wxNotebook::InsertPage(int nPage,
 
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
 
 void wxNotebook::OnSize(wxSizeEvent& event)
 {

-  // 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);
+  // 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();
+  }

 
   // fit the notebook page to the tab control's display area
   RECT rc;
 
   // fit the notebook page to the tab control's display area
   RECT rc;


@@ -398,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);

     }
   }
 }
     }
   }
 }


@@ -425,7 +445,7 @@ 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);
 
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 


@@ -439,21 +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;
 

-      // 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);
+    default:
+      return wxControl::MSWNotify(wParam, lParam, result);

   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   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;

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


@@ -463,11 +480,32 @@ 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)
 {

+  // MT-FIXME should use a real semaphore
+  static bool s_bInsideChangePage = 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;
 
   // 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);
 
   if ( nOldSel != -1 )
     m_aPages[nOldSel]->Show(FALSE);
 


@@ -475,7 +513,11 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
   pPage->Show(TRUE);
   pPage->SetFocus();
 
   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)
 }
 
 void wxNotebook::OnEraseBackground(wxEraseEvent& event)