PCH-less compilation fix

[wxWidgets.git] / src / common / nbkbase.cpp

diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp
index da418151d9a71990b14436105d7ea7e27fc5b33a..1671877483fab39387d62830faec06298329797e 100644 (file)
--- a/src/common/nbkbase.cpp
+++ b/src/common/nbkbase.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "notebookbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,110 +27,61 @@
 #if wxUSE_NOTEBOOK
 
 #ifndef WX_PRECOMP
 #if wxUSE_NOTEBOOK
 
 #ifndef WX_PRECOMP

-    #include "wx/notebook.h"
-    #include "wx/imaglist.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/notebook.h"
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// constructors and destructors
-// ----------------------------------------------------------------------------
-
-void wxNotebookBase::Init()
-{
-    m_imageList = NULL;
-    m_ownsImageList = FALSE;
-}
-
-wxNotebookBase::~wxNotebookBase()
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// image list
-// ----------------------------------------------------------------------------
-
-void wxNotebookBase::SetImageList(wxImageList* imageList)
-{
-    if ( m_ownsImageList )
-    {
-        // may be NULL, ok
-        delete m_imageList;
-
-        m_ownsImageList = FALSE;
-    }
-
-    m_imageList = imageList;
-}
-
-void wxNotebookBase::AssignImageList(wxImageList* imageList)
-{
-    SetImageList(imageList);
-    m_ownsImageList = TRUE;
-}
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)

 
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 

-wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const

 {
 {

-    // this was just taken from wxNotebookSizer::CalcMin() and is, of
-    // course, totally bogus - just like the original code was
+    // this is, of course, totally bogus -- but we must do something by
+    // default because not all ports implement this

     wxSize sizeTotal = sizePage;
     wxSize sizeTotal = sizePage;

-    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
+
+    if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) )
+    {

         sizeTotal.x += 90;
         sizeTotal.x += 90;

-    else
+        sizeTotal.y += 10;
+    }
+    else // tabs on top/bottom side
+    {
+        sizeTotal.x += 10;

         sizeTotal.y += 40;
         sizeTotal.y += 40;

+    }

 
     return sizeTotal;
 }
 
 // ----------------------------------------------------------------------------
 
     return sizeTotal;
 }
 
 // ----------------------------------------------------------------------------

-// pages management
+// events

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxNotebookBase::DeletePage(int nPage)
+bool wxNotebookBase::SendPageChangingEvent(int nPage)

 {
 {

-    wxNotebookPage *page = DoRemovePage(nPage);
-    if ( !page )
-        return FALSE;
-
-    delete page;
-
-    return TRUE;
+    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId());
+    event.SetSelection(nPage);
+    event.SetOldSelection(GetSelection());
+    event.SetEventObject(this);
+    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();

 }
 
 }
 

-int wxNotebookBase::GetNextPage(bool forward) const
+void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew)

 {
 {

-    int nPage;
-
-    int nMax = GetPageCount();
-    if ( nMax-- ) // decrement it to get the last valid index
-    {
-        int nSel = GetSelection();
-
-        // change selection wrapping if it becomes invalid
-        nPage = forward ? nSel == nMax ? 0
-                                       : nSel + 1
-                        : nSel == 0 ? nMax
-                                    : nSel - 1;
-    }
-    else // notebook is empty, no next page
-    {
-        nPage = -1;
-    }
-
-    return nPage;
+    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId());
+    event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew);
+    event.SetOldSelection(nPageOld);
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);

 }
 
 #endif // wxUSE_NOTEBOOK
 }
 
 #endif // wxUSE_NOTEBOOK

-