Added Changer classes

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

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index c3e7cb4821d0364773a3b878550abfa111146167..a77f340b2ecd97d4f6ac69288c3956cae4201e7e 100644 (file)
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -35,7 +35,7 @@
     #include  "wx/settings.h"
 #endif
 
     #include  "wx/settings.h"
 #endif
 

-#include  "wx/generic/imaglist.h"
+#include  "wx/imaglist.h"

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


@@ -84,7 +84,7 @@ class WXDLLEXPORT wxNotebookTabView: public wxTabView
 DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
 public:
     wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
 DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
 public:
     wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);

-    ~wxNotebookTabView(void);
+    virtual ~wxNotebookTabView(void);

 
     // Called when a tab is activated
     virtual void OnTabActivate(int activateId, int deactivateId);
 
     // Called when a tab is activated
     virtual void OnTabActivate(int activateId, int deactivateId);


@@ -150,6 +150,9 @@ bool wxNotebook::Create(wxWindow *parent,
     // base init
     SetName(name);
 
     // base init
     SetName(name);
 

+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;
+

     m_windowId = id == wxID_ANY ? NewControlId() : id;
 
     if (!wxControl::Create(parent, id, pos, size, style|wxNO_BORDER, wxDefaultValidator, name))
     m_windowId = id == wxID_ANY ? NewControlId() : id;
 
     if (!wxControl::Create(parent, id, pos, size, style|wxNO_BORDER, wxDefaultValidator, name))


@@ -189,6 +192,12 @@ int wxNotebook::SetSelection(size_t nPage)
     return 0;
 }
 
     return 0;
 }
 

+int wxNotebook::ChangeSelection(size_t nPage)
+{
+    // FIXME: currently it does generate events too
+    return SetSelection(nPage);
+}
+

 #if 0
 void wxNotebook::AdvanceSelection(bool bForward)
 {
 #if 0
 void wxNotebook::AdvanceSelection(bool bForward)
 {