MSVC 5 does not have BIF_EDITBOX.

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 94170c605e294a1568e6184f081aa972df6804e6..0f6f0036aa4d5338dbb20fa3f2a35a3542ef4917 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -33,6 +33,7 @@
 #include  "wx/generic/imaglist.h"
 #include  "wx/notebook.h"
 #include  "wx/dcclient.h"
 #include  "wx/generic/imaglist.h"
 #include  "wx/notebook.h"
 #include  "wx/dcclient.h"

+#include  "wx/generic/tabg.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -65,6 +66,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ============================================================================
+// Private class
+// ============================================================================
+
+// This reuses wxTabView to draw the tabs.
+class WXDLLEXPORT wxNotebookTabView: public wxTabView
+{
+DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
+public:
+  wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
+  ~wxNotebookTabView(void);
+
+  // Called when a tab is activated
+  virtual void OnTabActivate(int activateId, int deactivateId);
+  // Allows vetoing
+  virtual bool OnTabPreActivate(int activateId, int deactivateId);
+
+protected:
+   wxNotebook*      m_notebook;
+};
+

 // ----------------------------------------------------------------------------
 // wxNotebook construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook construction
 // ----------------------------------------------------------------------------


@@ -112,7 +134,7 @@ bool wxNotebook::Create(wxWindow *parent,
     if (!wxWindow::Create(parent, id, pos, size, style|wxNO_BORDER, name))
         return FALSE;
 
     if (!wxWindow::Create(parent, id, pos, size, style|wxNO_BORDER, name))
         return FALSE;
 

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 
     SetTabView(new wxNotebookTabView(this));
 
 
     SetTabView(new wxNotebookTabView(this));
 


@@ -679,4 +701,36 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
   m_notebook->GetEventHandler()->ProcessEvent(event);
 }
 
   m_notebook->GetEventHandler()->ProcessEvent(event);
 }
 

+// Allows Vetoing
+bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
+{
+  bool retval = TRUE;
+  
+  if (m_notebook)
+  {
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId());
+
+#if defined (__WIN16__)
+    int activatePos = activateId;
+    int deactivatePos = deactivateId;
+#else
+    // Translate from wxTabView's ids (which aren't position-dependent)
+    // to wxNotebook's (which are).
+    wxNotebookPage* pActive = (wxNotebookPage*) activateId;
+    wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
+
+    int activatePos = m_notebook->FindPagePosition(pActive);
+    int deactivatePos = m_notebook->FindPagePosition(pDeactive);
+
+#endif
+    event.SetEventObject(m_notebook);
+    event.SetSelection(activatePos);
+    event.SetOldSelection(deactivatePos);
+    if (m_notebook->GetEventHandler()->ProcessEvent(event))
+    {
+      retval = event.IsAllowed();
+    }
+  }
+  return retval;
+}