fixed calling Union() or Offset() on a previously Clear()ed region, also removed...

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 426b8af2a082a109860a4160dc0185009c53577d..36e50c706b45f8fe8827b7ce35539683fe720814 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -17,9 +17,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_NOTEBOOK
+

 // wxWindows
 #ifndef WX_PRECOMP
   #include  "wx/string.h"
 // wxWindows
 #ifndef WX_PRECOMP
   #include  "wx/string.h"


@@ -46,7 +48,7 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -108,8 +110,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

-  m_pImageList = NULL;
-  m_bOwnsImageList = FALSE;
+  m_imageList = NULL;

   m_nSelection = -1;
 }
 
   m_nSelection = -1;
 }
 


@@ -140,70 +141,59 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

-  // base init
-  if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-      return FALSE;
-
-  // colors and font
-  m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
-  m_foregroundColour = *wxBLACK;
-
-  // style
-  m_windowStyle = style | wxTAB_TRAVERSAL;
-
-  long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
-
-  if (m_windowStyle & wxCLIP_CHILDREN)
-    tabStyle |= WS_CLIPCHILDREN;
-  if ( m_windowStyle & wxTC_MULTILINE )
-    tabStyle |= TCS_MULTILINE;
-  if ( m_windowStyle & wxBORDER )
-    tabStyle &= WS_BORDER;
-  if (m_windowStyle & wxNB_FIXEDWIDTH)
-    tabStyle |= TCS_FIXEDWIDTH ;
-  if (m_windowStyle & wxNB_BOTTOM)
-    tabStyle |= TCS_RIGHT;
-  if (m_windowStyle & wxNB_LEFT)
-    tabStyle |= TCS_VERTICAL;
-  if (m_windowStyle & wxNB_RIGHT)
-    tabStyle |= TCS_VERTICAL|TCS_RIGHT;
-
-
-  if ( !MSWCreate(GetId(), GetParent(), WC_TABCONTROL,
-                  this, NULL, pos.x, pos.y, size.x, size.y,
-                  tabStyle, NULL, 0) )
-  {
-    return FALSE;
-  }
+    // base init
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;

 
 

-  // Not all compilers recognise SetWindowFont
-  ::SendMessage(GetHwnd(), WM_SETFONT,
-                (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE);
+    // notebook, so explicitly specify 0 as last parameter
+    if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size,
+                style | wxTAB_TRAVERSAL) )
+        return FALSE;

 
 

+    SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));

 
 

-  if ( parent != NULL )
-    parent->AddChild(this);
-
-  SubclassWin(m_hWnd);
-
-  return TRUE;
+    return TRUE;

 }
 
 }
 

-// dtor
-wxNotebook::~wxNotebook()
+WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const

 {
 {

-  if (m_bOwnsImageList) delete m_pImageList;
+    WXDWORD tabStyle = wxControl::MSWGetStyle(style, exstyle);
+
+    tabStyle |= WS_TABSTOP | TCS_TABS;
+
+    if ( style & wxTC_MULTILINE )
+        tabStyle |= TCS_MULTILINE;
+    if ( style & wxNB_FIXEDWIDTH )
+        tabStyle |= TCS_FIXEDWIDTH;
+
+    if ( style & wxNB_BOTTOM )
+        tabStyle |= TCS_RIGHT;
+    else if ( style & wxNB_LEFT )
+        tabStyle |= TCS_VERTICAL;
+    else if ( style & wxNB_RIGHT )
+        tabStyle |= TCS_VERTICAL | TCS_RIGHT;
+
+    // ex style
+    if ( exstyle )
+    {
+        // note that we never want to have the default WS_EX_CLIENTEDGE style
+        // as it looks too ugly for the notebooks
+        *exstyle = 0;
+    }
+
+    return tabStyle;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------

+

 int wxNotebook::GetPageCount() const
 {
   // consistency check
 int wxNotebook::GetPageCount() const
 {
   // consistency check

-  wxASSERT( (int)m_aPages.Count() == TabCtrl_GetItemCount(m_hwnd) );
+  wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) );

 
 

-  return m_aPages.Count();
+  return m_pages.Count();

 }
 
 int wxNotebook::GetRowCount() const
 }
 
 int wxNotebook::GetRowCount() const


@@ -220,16 +210,6 @@ int wxNotebook::SetSelection(int nPage)
   return TabCtrl_SetCurSel(m_hwnd, nPage);
 }
 
   return TabCtrl_SetCurSel(m_hwnd, nPage);
 }
 

-void wxNotebook::AdvanceSelection(bool bForward)
-{
-  int nSel = GetSelection();
-  int nMax = GetPageCount() - 1;
-  if ( bForward )
-    SetSelection(nSel == nMax ? 0 : nSel + 1);
-  else
-    SetSelection(nSel == 0 ? nMax : nSel - 1);
-}
-

 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
   wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
   wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );


@@ -281,16 +261,12 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 {
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 {

-  if (m_bOwnsImageList) delete m_pImageList;
-  m_pImageList = imageList;
-  m_bOwnsImageList = FALSE;
-  TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
-}
+  wxNotebookBase::SetImageList(imageList);

 
 

-void wxNotebook::AssignImageList(wxImageList* imageList)
-{
-  SetImageList(imageList);
-  m_bOwnsImageList = TRUE;
+  if ( imageList )
+  {
+    TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
+  }

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


@@ -341,10 +317,10 @@ bool wxNotebook::DeletePage(int nPage)
 
   TabCtrl_DeleteItem(m_hwnd, nPage);
 
 
   TabCtrl_DeleteItem(m_hwnd, nPage);
 

-  delete m_aPages[nPage];
-  m_aPages.Remove(nPage);
+  delete m_pages[nPage];
+  m_pages.RemoveAt(nPage);

 
 

-  if ( m_aPages.IsEmpty() ) {
+  if ( m_pages.IsEmpty() ) {

       // no selection if the notebook became empty
       m_nSelection = -1;
   }
       // no selection if the notebook became empty
       m_nSelection = -1;
   }


@@ -356,20 +332,20 @@ bool wxNotebook::DeletePage(int nPage)
 }
 
 // remove one page from the notebook, without deleting
 }
 
 // remove one page from the notebook, without deleting

-bool wxNotebook::RemovePage(int nPage)
+wxNotebookPage *wxNotebook::DoRemovePage(int nPage)

 {
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
+  wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage);
+  if ( !pageRemoved )
+      return NULL;

 
   TabCtrl_DeleteItem(m_hwnd, nPage);
 
 
   TabCtrl_DeleteItem(m_hwnd, nPage);
 

-  m_aPages.Remove(nPage);
-
-  if ( m_aPages.IsEmpty() )
-      m_nSelection = -1;
-    else
-      m_nSelection = TabCtrl_GetCurSel(m_hwnd);
+  if ( m_pages.IsEmpty() )
+    m_nSelection = -1;
+  else
+    m_nSelection = TabCtrl_GetCurSel(m_hwnd);

 
 

-  return TRUE;
+  return pageRemoved;

 }
 
 // remove all pages
 }
 
 // remove all pages


@@ -378,9 +354,9 @@ bool wxNotebook::DeleteAllPages()
   int nPageCount = GetPageCount();
   int nPage;
   for ( nPage = 0; nPage < nPageCount; nPage++ )
   int nPageCount = GetPageCount();
   int nPage;
   for ( nPage = 0; nPage < nPageCount; nPage++ )

-    delete m_aPages[nPage];
+    delete m_pages[nPage];

 
 

-  m_aPages.Clear();
+  m_pages.Clear();

 
   TabCtrl_DeleteAllItems(m_hwnd);
 
 
   TabCtrl_DeleteAllItems(m_hwnd);
 


@@ -441,7 +417,7 @@ bool wxNotebook::InsertPage(int nPage,
   }
 
   // save the pointer to the page
   }
 
   // save the pointer to the page

-  m_aPages.Insert(pPage, nPage);
+  m_pages.Insert(pPage, nPage);

 
   // don't show pages by default (we'll need to adjust their size first)
   HWND hwnd = GetWinHwnd(pPage);
 
   // don't show pages by default (we'll need to adjust their size first)
   HWND hwnd = GetWinHwnd(pPage);


@@ -486,9 +462,9 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 
   int width = rc.right - rc.left,
       height = rc.bottom - rc.top;
 
   int width = rc.right - rc.left,
       height = rc.bottom - rc.top;

-  size_t nCount = m_aPages.Count();
+  size_t nCount = m_pages.Count();

   for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
   for ( size_t nPage = 0; nPage < nCount; nPage++ ) {

-    wxNotebookPage *pPage = m_aPages[nPage];
+    wxNotebookPage *pPage = m_pages[nPage];

     pPage->SetSize(rc.left, rc.top, width, height);
   }
 
     pPage->SetSize(rc.left, rc.top, width, height);
   }
 


@@ -502,12 +478,12 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
   {
       int sel = event.GetOldSelection();
       if ( sel != -1 )
   {
       int sel = event.GetOldSelection();
       if ( sel != -1 )

-        m_aPages[sel]->Show(FALSE);
+        m_pages[sel]->Show(FALSE);

 
       sel = event.GetSelection();
       if ( sel != -1 )
       {
 
       sel = event.GetSelection();
       if ( sel != -1 )
       {

-        wxNotebookPage *pPage = m_aPages[sel];
+        wxNotebookPage *pPage = m_pages[sel];

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


@@ -528,7 +504,7 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event)
 
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )
 
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )

-        m_aPages[m_nSelection]->SetFocus();
+        m_pages[m_nSelection]->SetFocus();

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -564,7 +540,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
                 // and is being propagated downwards
                 event.SetEventObject(this);
 
                 // and is being propagated downwards
                 event.SetEventObject(this);
 

-                wxWindow *page = m_aPages[m_nSelection];
+                wxWindow *page = m_pages[m_nSelection];

                 if ( !page->GetEventHandler()->ProcessEvent(event) )
                 {
                     page->SetFocus();
                 if ( !page->GetEventHandler()->ProcessEvent(event) )
                 {
                     page->SetFocus();


@@ -605,6 +581,21 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
   return TRUE;
 }
 
   return TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// wxNotebook Windows message handlers
+// ----------------------------------------------------------------------------
+
+bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode,
+                             WXWORD pos, WXHWND control)
+{
+    // don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the
+    // up-down control
+    if ( control )
+        return FALSE;
+
+    return wxNotebookBase::MSWOnScroll(orientation, nSBCode, pos, control);
+}
+

 bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);


@@ -660,7 +651,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
   event.SetSelection(nSel);
   event.SetOldSelection(nOldSel);
   event.SetEventObject(this);
   event.SetSelection(nSel);
   event.SetOldSelection(nOldSel);
   event.SetEventObject(this);

-  if ( ProcessEvent(event) && !event.IsAllowed() )
+  if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )

   {
     // program doesn't allow the page change
     s_bInsideChangePage = FALSE;
   {
     // program doesn't allow the page change
     s_bInsideChangePage = FALSE;


@@ -668,7 +659,9 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
   }
 
   event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
   }
 
   event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);

-  ProcessEvent(event);
+  GetEventHandler()->ProcessEvent(event);

 
   s_bInsideChangePage = FALSE;
 }
 
   s_bInsideChangePage = FALSE;
 }

+
+#endif // wxUSE_NOTEBOOK