Suppose I should trust the headers in BC++5.02 more than BC++4.52

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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 4a1d57d6b73fdaab1ae52c62b615fa8c4f54463e..d6c5fc5234928a1857e22c93b29aa1ab0cb03071 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/notebook.cpp
 // Purpose:     implementation of wxNotebook
 // Author:      Vadim Zeitlin
 // Name:        msw/notebook.cpp
 // Purpose:     implementation of wxNotebook
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     11.06.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     11.06.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -69,8 +69,9 @@
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)

-    EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
+

     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)

+

     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
 
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
 


@@ -121,10 +122,7 @@ bool wxNotebook::Create(wxWindow *parent,
                         const wxString& name)
 {
   // base init
                         const wxString& name)
 {
   // base init

-  SetName(name);
-  SetParent(parent);
-
-  m_windowId = id == -1 ? NewControlId() : id;
+  CreateBase(parent, id, pos, size, style, name);

 
   // colors and font
   m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
 
   // colors and font
   m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));


@@ -133,7 +131,10 @@ bool wxNotebook::Create(wxWindow *parent,
   // style
   m_windowStyle = style | wxTAB_TRAVERSAL;
 
   // style
   m_windowStyle = style | wxTAB_TRAVERSAL;
 

-  long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS | WS_CLIPCHILDREN;
+  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 )
   if ( m_windowStyle & wxTC_MULTILINE )
     tabStyle |= TCS_MULTILINE;
   if ( m_windowStyle & wxBORDER )


@@ -141,34 +142,21 @@ bool wxNotebook::Create(wxWindow *parent,
   if (m_windowStyle & wxNB_FIXEDWIDTH)
     tabStyle |= TCS_FIXEDWIDTH ;
 
   if (m_windowStyle & wxNB_FIXEDWIDTH)
     tabStyle |= TCS_FIXEDWIDTH ;
 

-  // create the tab control.
-  m_hWnd = (WXHWND)CreateWindowEx
-    (
-      0,                                      // extended style
-      WC_TABCONTROL,                          // class name for the tab control
-      "",                                     // no caption
-      tabStyle,                               // style
-      pos.x, pos.y, size.x, size.y,           // size and position
-      (HWND)parent->GetHWND(),                // parent window
-      (HMENU)m_windowId,                      // child id
-      wxGetInstance(),                        // current instance
-      NULL                                    // no class data
-    );
-
-  if ( m_hWnd == 0 ) {
-    wxLogSysError("Can't create the notebook control");
+  if ( !MSWCreate(GetId(), GetParent(), WC_TABCONTROL,
+                  this, NULL, pos.x, pos.y, size.x, size.y,
+                  tabStyle, NULL, 0) )
+  {

     return FALSE;
   }
 
   // Not all compilers recognise SetWindowFont
     return FALSE;
   }
 
   // Not all compilers recognise SetWindowFont

-//  SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE);
-  ::SendMessage((HWND) m_hwnd, WM_SETFONT,
-                  (WPARAM)::GetStockObject(DEFAULT_GUI_FONT),TRUE);
+  ::SendMessage(GetHwnd(), WM_SETFONT,
+                (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE);

 
 
 
 

-  if ( parent != NULL ) 
+  if ( parent != NULL )

     parent->AddChild(this);
     parent->AddChild(this);

-  
+

   SubclassWin(m_hWnd);
 
   return TRUE;
   SubclassWin(m_hWnd);
 
   return TRUE;


@@ -197,7 +185,7 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(int nPage)
 {
 
 int wxNotebook::SetSelection(int nPage)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("notebook page out of range") );

 
   ChangePage(m_nSelection, nPage);
 
 
   ChangePage(m_nSelection, nPage);
 


@@ -216,20 +204,20 @@ void wxNotebook::AdvanceSelection(bool bForward)
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") );

 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;

-  tcItem.pszText = (char *)strText.c_str();
+  tcItem.pszText = (wxChar *)strText.c_str();

 
   return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0;
 }
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
 
   return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0;
 }
 
 wxString wxNotebook::GetPageText(int nPage) const
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), "", "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("notebook page out of range") );

 
 

-  char buf[256];
+  wxChar buf[256];

   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;
   tcItem.pszText = buf;
   TC_ITEM tcItem;
   tcItem.mask = TCIF_TEXT;
   tcItem.pszText = buf;


@@ -244,7 +232,7 @@ wxString wxNotebook::GetPageText(int nPage) const
 
 int wxNotebook::GetPageImage(int nPage) const
 {
 
 int wxNotebook::GetPageImage(int nPage) const
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("notebook page out of range") );

 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;


@@ -254,7 +242,7 @@ int wxNotebook::GetPageImage(int nPage) const
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") );

 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;
 
   TC_ITEM tcItem;
   tcItem.mask = TCIF_IMAGE;


@@ -264,11 +252,19 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)

-{ 
+{

   m_pImageList = imageList;
   TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
 }
 
   m_pImageList = imageList;
   TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST());
 }
 

+
+// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
+// style.
+void wxNotebook::SetTabSize(const wxSize& sz)
+{
+    ::SendMessage(GetHwnd(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y));
+}
+

 // ----------------------------------------------------------------------------
 // wxNotebook operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook operations
 // ----------------------------------------------------------------------------


@@ -276,7 +272,7 @@ 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)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") );

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


@@ -289,7 +285,7 @@ bool wxNotebook::DeletePage(int nPage)
 // remove one page from the notebook, without deleting
 bool wxNotebook::RemovePage(int nPage)
 {
 // remove one page from the notebook, without deleting
 bool wxNotebook::RemovePage(int nPage)
 {

-  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" );
+  wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") );

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


@@ -301,8 +297,6 @@ bool wxNotebook::RemovePage(int nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-  TabCtrl_DeleteAllItems(m_hwnd);
-

   int nPageCount = GetPageCount();
   int nPage;
   for ( nPage = 0; nPage < nPageCount; nPage++ )
   int nPageCount = GetPageCount();
   int nPage;
   for ( nPage = 0; nPage < nPageCount; nPage++ )


@@ -310,6 +304,8 @@ bool wxNotebook::DeleteAllPages()
 
   m_aPages.Clear();
 
 
   m_aPages.Clear();
 

+  TabCtrl_DeleteAllItems(m_hwnd);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -347,20 +343,20 @@ bool wxNotebook::InsertPage(int nPage,
   if (!strText.IsEmpty())
   {
     tcItem.mask    |= TCIF_TEXT;
   if (!strText.IsEmpty())
   {
     tcItem.mask    |= TCIF_TEXT;

-    tcItem.pszText = (char *)strText.c_str();
+    tcItem.pszText = (wxChar *)strText.c_str();

   }
   else
   }
   else

-    tcItem.pszText = (char *) NULL;
+    tcItem.pszText = (wxChar *) NULL;

 
   if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) {
 
   if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) {

-    wxLogError("Can't create the notebook page '%s'.", strText.c_str());
+    wxLogError(_T("Can't create the notebook page '%s'."), strText.c_str());

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

-  // some page must be selected: either this one or the first one if there is 
+  // some page must be selected: either this one or the first one if there is

   // still no selection
   if ( bSelect )
     m_nSelection = nPage;
   // still no selection
   if ( bSelect )
     m_nSelection = nPage;


@@ -368,9 +364,12 @@ bool wxNotebook::InsertPage(int nPage,
     m_nSelection = 0;
 
   // don't show pages by default (we'll need to adjust their size first)
     m_nSelection = 0;
 
   // don't show pages by default (we'll need to adjust their size first)

-  HWND hwnd = (HWND)pPage->GetHWND();
+  HWND hwnd = GetWinHwnd(pPage);

   SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE);
 
   SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE);
 

+  // this updates internal flag too - otherwise it will get out of sync
+  pPage->Show(FALSE);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -456,12 +455,7 @@ bool wxNotebook::DoPhase(int /* nPhase */)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxNotebook::Command(wxCommandEvent& event)
-{
-  wxFAIL_MSG("wxNotebook::Command not implemented");
-}
-
-bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
+bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)

 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 


@@ -476,13 +470,13 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
       break;
 
     default:
       break;
 
     default:

-      return wxControl::MSWNotify(wParam, lParam, result);
+      return wxControl::MSWOnNotify(idCtrl, lParam, result);

   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);

-  event.SetInt(LOWORD(wParam)); // ctrl id
+  event.SetInt(idCtrl);

 
   bool processed = GetEventHandler()->ProcessEvent(event);
   *result = !event.IsAllowed();
 
   bool processed = GetEventHandler()->ProcessEvent(event);
   *result = !event.IsAllowed();


@@ -535,16 +529,3 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
   m_nSelection = nSel;
   s_bInsideChangePage = FALSE;
 }
   m_nSelection = nSel;
   s_bInsideChangePage = FALSE;
 }

-
-void wxNotebook::OnEraseBackground(wxEraseEvent& event)
-{
-    Default();
-}
-
-// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
-// style.
-void wxNotebook::SetTabSize(const wxSize& sz)
-{
-    ::SendMessage((HWND) GetHWND(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y));
-}
-