Fixed bug in dc::blit()

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

diff --git a/src/motif/notebook.cpp b/src/motif/notebook.cpp
index c93dbba6f9a6f1d115c39a9b03104e783b0c9397..ba296eb4d07eb18e1c139b0188270158e8275778 100644 (file)
--- a/src/motif/notebook.cpp
+++ b/src/motif/notebook.cpp
@@ -24,6 +24,10 @@
 #include  <wx/log.h>
 #include  <wx/imaglist.h>
 #include  <wx/notebook.h>
 #include  <wx/log.h>
 #include  <wx/imaglist.h>
 #include  <wx/notebook.h>

+#include  <wx/dcclient.h>
+
+#include  <Xm/Xm.h>
+#include  <wx/motif/private.h>

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


@@ -39,8 +43,9 @@
 #if !USE_SHARED_LIBRARIES
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 #if !USE_SHARED_LIBRARIES
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)

-

     EVT_SIZE(wxNotebook::OnSize)
     EVT_SIZE(wxNotebook::OnSize)

+    EVT_PAINT(wxNotebook::OnPaint)
+    EVT_MOUSE_EVENTS(wxNotebook::OnMouseEvent)

     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()


@@ -60,6 +65,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

+    m_tabView = (wxNotebookTabView*) NULL;

     m_pImageList = NULL;
     m_nSelection = -1;
 }
     m_pImageList = NULL;
     m_nSelection = -1;
 }


@@ -93,24 +99,22 @@ bool wxNotebook::Create(wxWindow *parent,
 {
     // base init
     SetName(name);
 {
     // base init
     SetName(name);

-    SetParent(parent);

 
     m_windowId = id == -1 ? NewControlId() : id;
 
 
     m_windowId = id == -1 ? NewControlId() : id;
 

-    // style
-    m_windowStyle = style;
+    // It's like a normal window...
+    if (!wxWindow::Create(parent, id, pos, size, style, name))
+        return FALSE;

 
 

-    if ( parent != NULL )
-        parent->AddChild(this);
-
-    // TODO
+    SetTabView(new wxNotebookTabView(this));

 
 

-    return FALSE;
+    return TRUE;

 }
 
 // dtor
 wxNotebook::~wxNotebook()
 {
 }
 
 // dtor
 wxNotebook::~wxNotebook()
 {

+    delete m_tabView;

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


@@ -129,6 +133,9 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(int nPage)
 {
 
 int wxNotebook::SetSelection(int nPage)
 {

+    if (nPage == -1)
+      return 0;
+

     wxASSERT( IS_VALID_PAGE(nPage) );
 
     ChangePage(m_nSelection, nPage);
     wxASSERT( IS_VALID_PAGE(nPage) );
 
     ChangePage(m_nSelection, nPage);


@@ -192,6 +199,10 @@ void wxNotebook::SetImageList(wxImageList* imageList)
 // remove one page from the notebook
 bool wxNotebook::DeletePage(int nPage)
 {
 // remove one page from the notebook
 bool wxNotebook::DeletePage(int nPage)
 {

+    wxFAIL_MSG("Sorry, DeletePage not implemented for Motif wxNotebook because wxTabView doesn't support it.");
+    return FALSE;
+
+/*

     wxCHECK( IS_VALID_PAGE(nPage), FALSE );
 
     // TODO: delete native widget page
     wxCHECK( IS_VALID_PAGE(nPage), FALSE );
 
     // TODO: delete native widget page


@@ -200,12 +211,13 @@ bool wxNotebook::DeletePage(int nPage)
     m_aPages.Remove(nPage);
 
     return TRUE;
     m_aPages.Remove(nPage);
 
     return TRUE;

+*/

 }
 
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 }
 
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-    // TODO: delete native widget pages
+    m_tabView->ClearTabs(TRUE);

 
     int nPageCount = GetPageCount();
     int nPage;
 
     int nPageCount = GetPageCount();
     int nPage;


@@ -236,7 +248,13 @@ bool wxNotebook::InsertPage(int nPage,
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 

-    // TODO: insert native widget page
+    m_tabView->AddTab(nPage, strText);
+    pPage->Show(FALSE);
+
+/*
+    if (bSelect)
+        m_tabView->SetTabSelection(nPage, TRUE);
+*/

 
     // save the pointer to the page
     m_aPages.Insert(pPage, nPage);
 
     // save the pointer to the page
     m_aPages.Insert(pPage, nPage);


@@ -265,24 +283,55 @@ void wxNotebook::OnSize(wxSizeEvent& event)
         s_bFirstTime = FALSE;
     }
 
         s_bFirstTime = FALSE;
     }
 

-    // TODO: all this may or may not be necessary for your platform
-
-    // 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);
-
-    // fit the notebook page to the tab control's display area
-    int w, h;
-    GetSize(&w, &h);
-
-    unsigned int nCount = m_aPages.Count();
-    for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
-        wxNotebookPage *pPage = m_aPages[nPage];
-        pPage->SetSize(0, 0, w, h);
-        if ( pPage->GetAutoLayout() )
-            pPage->Layout();
+    if (m_tabView)
+    {
+        int cw, ch;
+        GetClientSize(& cw, & ch);
+
+        int tabHeight = m_tabView->GetTotalTabHeight();
+        wxRect rect;
+        rect.x = 4;
+        rect.y = tabHeight + 4;
+        rect.width = cw - 8;
+        rect.height = ch - 4 - rect.y ;
+  
+        m_tabView->SetViewRect(rect);
+
+        m_tabView->Layout();
+
+        // Need to do it a 2nd time to get the tab height with
+        // the new view width, since changing the view width changes the
+        // tab layout.
+        tabHeight = m_tabView->GetTotalTabHeight();
+        rect.x = 4;
+        rect.y = tabHeight + 4;
+        rect.width = cw - 8;
+        rect.height = ch - 4 - rect.y ;
+  
+        m_tabView->SetViewRect(rect);
+
+        m_tabView->Layout();
+
+        // 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);
+
+        // fit the notebook page to the tab control's display area
+
+        unsigned int nCount = m_aPages.Count();
+        for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
+            wxNotebookPage *pPage = m_aPages[nPage];
+            if (pPage->IsShown())
+            {
+                wxRect clientRect = GetAvailableClientSize();
+                pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+                if ( pPage->GetAutoLayout() )
+                   pPage->Layout();
+            }
+        }
+        Refresh();

     }
 
     // Processing continues to next OnSize
     }
 
     // Processing continues to next OnSize


@@ -356,27 +405,164 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
 
     if ( nOldSel != -1 ) {
         m_aPages[nOldSel]->Show(FALSE);
 
     if ( nOldSel != -1 ) {
         m_aPages[nOldSel]->Show(FALSE);

+        m_aPages[nOldSel]->Lower();

     }
 
     wxNotebookPage *pPage = m_aPages[nSel];
     }
 
     wxNotebookPage *pPage = m_aPages[nSel];

+
+    wxRect clientRect = GetAvailableClientSize();
+    pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+

     pPage->Show(TRUE);
     pPage->Show(TRUE);

+    pPage->Raise();

     pPage->SetFocus();
 
     pPage->SetFocus();
 

+    Refresh();
+

     m_nSelection = nSel;
 }
 
     m_nSelection = nSel;
 }
 

-void wxNotebook::ChangeFont()
+void wxNotebook::ChangeFont(bool keepOriginalSize)

 {
 {

-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxNotebook::ChangeBackgroundColour()
 {
 }
 
 void wxNotebook::ChangeBackgroundColour()
 {

-    // TODO
+    wxWindow::ChangeBackgroundColour();

 }
 
 void wxNotebook::ChangeForegroundColour()
 {
 }
 
 void wxNotebook::ChangeForegroundColour()
 {

-    // TODO
+    wxWindow::ChangeForegroundColour();
+}
+
+void wxNotebook::OnMouseEvent(wxMouseEvent& event)
+{
+  if (m_tabView)
+    m_tabView->OnEvent(event);
+}
+
+void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event) )
+{
+    wxPaintDC dc(this);
+    if (m_tabView)
+        m_tabView->Draw(dc);
+}
+
+wxRect wxNotebook::GetAvailableClientSize()
+{
+    int cw, ch;
+    GetClientSize(& cw, & ch);
+
+    int tabHeight = m_tabView->GetTotalTabHeight();
+
+    // TODO: these margins should be configurable.
+    wxRect rect;
+    rect.x = 6;
+    rect.y = tabHeight + 6;
+    rect.width = cw - 12;
+    rect.height = ch - 4 - rect.y ;
+
+    return rect;
+}
+
+/*
+ * wxNotebookTabView
+ */
+ 
+IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
+
+wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)
+{
+  m_notebook = notebook;
+
+  m_notebook->SetTabView(this);
+
+  SetWindow(m_notebook);
+}
+
+wxNotebookTabView::~wxNotebookTabView(void)
+{
+}
+
+// Called when a tab is activated
+void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
+{
+  if (!m_notebook)
+    return;
+
+  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
+  event.SetEventObject(m_notebook);
+  event.SetSelection(activateId);
+  event.SetOldSelection(deactivateId);
+  m_notebook->GetEventHandler()->ProcessEvent(event);
+  
+  /*    
+  wxWindow *oldWindow = ((deactivateId == -1) ? 0 : m_notebook->GetPage(deactivateId));
+  wxWindow *newWindow = m_notebook->GetPage(activateId);
+
+  if (oldWindow)
+  {
+    oldWindow->Show(FALSE);
+    oldWindow->Lower();
+  }
+  if (newWindow)
+  {
+    newWindow->Show(TRUE);
+    newWindow->Raise();
+
+    int cw, ch;
+    m_notebook->GetClientSize(& cw, & ch);
+
+    int tabHeight = GetTotalTabHeight();
+    wxRect rect;
+    rect.x = 4;
+    rect.y = tabHeight + 4;
+    rect.width = cw - 8;
+    rect.height = ch - 4 - rect.y ;
+  
+    newWindow->SetSize(rect.x + 2, rect.y + 2, rect.width - 2, rect.height - 2);
+    newWindow->Refresh();
+  }
+
+  // TODO: only refresh the tab area.    
+  m_notebook->Refresh();
+*/
+}
+
+#if 0
+void wxNotebookTabView::AddTabWindow(int id, wxWindow *window)
+{
+  m_tabWindows.Append((long)id, window);
+  window->Show(FALSE);
+}
+
+wxWindow *wxNotebookTabView::GetTabWindow(int id) const
+{
+  wxNode *node = m_tabWindows.Find((long)id);
+  if (!node)
+    return (wxWindow *) NULL;
+  return (wxWindow *)node->Data();    

 }
 
 }
 

+void wxNotebookTabView::ClearWindows(bool deleteWindows)
+{
+  if (deleteWindows)
+    m_tabWindows.DeleteContents(TRUE);
+  m_tabWindows.Clear();
+  m_tabWindows.DeleteContents(FALSE);
+}
+
+void wxNotebookTabView::ShowWindowForTab(int id)
+{
+  wxWindow *newWindow = GetTabWindow(id);
+  if (newWindow == m_currentWindow)
+    return;
+  if (m_currentWindow)
+    m_currentWindow->Show(FALSE);
+  newWindow->Show(TRUE);
+  newWindow->Refresh();
+}
+#endif
+