All variables/parameters having to do with number of columns changed to be of type...

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

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index f7ee49cd5d09c1aec3707f8d9685a54308bb94ba..efb99e30e452d1fbd8f0c80fba06a963424dc6a9 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -1,53 +1,73 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.cpp
 // Purpose:     implementation of wxNotebook
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.cpp
 // Purpose:     implementation of wxNotebook

-// Author:      AUTHOR
-// Modified by: 
-// Created:     ??/??/98
+// Author:      David Webster
+// Modified by:
+// Created:     10/12/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
+// wxWindows
+#ifndef WX_PRECOMP
+  #include  <wx/string.h>
+#endif  // WX_PRECOMP

 
 

-#include  <wx/string.h>

 #include  <wx/log.h>
 #include  <wx/imaglist.h>
 #include  <wx/log.h>
 #include  <wx/imaglist.h>

+#include  <wx/event.h>
+#include  <wx/control.h>

 #include  <wx/notebook.h>
 
 #include  <wx/notebook.h>
 

+#include  <wx/os2/private.h>
+
+

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

-

 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
 

+// hide the ugly cast
+#define m_hwnd    (HWND)GetHWND()
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// This is a work-around for missing defines in gcc-2.95 headers
+#ifndef TCS_RIGHT
+    #define TCS_RIGHT       0x0002
+#endif
+
+#ifndef TCS_VERTICAL
+    #define TCS_VERTICAL    0x0080
+#endif
+
+#ifndef TCS_BOTTOM
+    #define TCS_BOTTOM      TCS_RIGHT
+#endif
+

 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+

 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)

-

     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)

-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)

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


@@ -91,19 +111,53 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

-    // base init
-    SetName(name);
-    SetParent(parent);
+  // base init
+  if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+      return FALSE;
+
+  // colors and font
+// TODO:  m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
+  m_foregroundColour = *wxBLACK ;
+
+    // TODO:
+/*
+  // 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;
+  }

 
 

-    m_windowId = id == -1 ? NewControlId() : id;
+  // Not all compilers recognise SetWindowFont
+  ::SendMessage(GetHwnd(), WM_SETFONT,
+                (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE);

 
 

-    // style
-    m_windowStyle = style;

 
 

-    if ( parent != NULL )
-        parent->AddChild(this);
-
-    // TODO
+  if ( parent != NULL )
+    parent->AddChild(this);
+*/
+  SubclassWin(m_hWnd);

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -129,7 +183,7 @@ int wxNotebook::GetRowCount() const
 
 int wxNotebook::SetSelection(int nPage)
 {
 
 int wxNotebook::SetSelection(int nPage)
 {

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

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


@@ -149,7 +203,7 @@ void wxNotebook::AdvanceSelection(bool bForward)
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {

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

 
     // TODO
     return FALSE;
 
     // TODO
     return FALSE;


@@ -157,7 +211,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
 
 wxString wxNotebook::GetPageText(int nPage) const
 {

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

 
     // TODO
     return wxString("");
 
     // TODO
     return wxString("");


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

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

 
     // TODO
     return 0;
 
     // TODO
     return 0;


@@ -173,18 +227,23 @@ int wxNotebook::GetPageImage(int nPage) const
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {

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

 
     // TODO
     return FALSE;
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)
 
     // TODO
     return FALSE;
 }
 
 void wxNotebook::SetImageList(wxImageList* imageList)

-{ 
+{

     m_pImageList = imageList;
     // TODO
 }
 
     m_pImageList = imageList;
     // TODO
 }
 

+void wxNotebook::SetTabSize(const wxSize& sz)
+{
+    // TODO
+}
+

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


@@ -192,7 +251,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( IS_VALID_PAGE(nPage), FALSE );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );

 
     // TODO: delete native widget page
 
 
     // TODO: delete native widget page
 


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

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

 
     m_aPages.Remove(nPage);
 
 
     m_aPages.Remove(nPage);
 


@@ -251,7 +310,7 @@ bool wxNotebook::InsertPage(int nPage,
     // save the pointer to the page
     m_aPages.Insert(pPage, nPage);
 
     // 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;


@@ -291,8 +350,11 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_aPages[nPage];
         pPage->SetSize(0, 0, w, h);
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_aPages[nPage];
         pPage->SetSize(0, 0, w, h);

+#if wxUSE_CONSTRAINTS

         if ( pPage->GetAutoLayout() )
             pPage->Layout();
         if ( pPage->GetAutoLayout() )
             pPage->Layout();

+#endif //wxUSE_CONSTRAINTS
+

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


@@ -303,8 +365,21 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
 {
     // is it our tab control?
     if ( event.GetEventObject() == this )
 {
     // is it our tab control?
     if ( event.GetEventObject() == this )

-        ChangePage(event.GetOldSelection(), event.GetSelection());
+    {
+        int sel = event.GetOldSelection();
+        if ( sel != -1 )
+            m_aPages[sel]->Show(FALSE);
+
+        sel = event.GetSelection();
+        if ( sel != -1 )
+        {
+            wxNotebookPage *pPage = m_aPages[sel];
+            pPage->Show(TRUE);
+            pPage->SetFocus();
+        }

 
 

+        m_nSelection = sel;
+  }

     // we want to give others a chance to process this message as well
     event.Skip();
 }
     // we want to give others a chance to process this message as well
     event.Skip();
 }


@@ -341,8 +416,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 void wxNotebook::SetConstraintSizes(bool /* recurse */)
 {
 
 void wxNotebook::SetConstraintSizes(bool /* recurse */)
 {

+#if wxUSE_CONSTRAINTS

     // don't set the sizes of the pages - their correct size is not yet known
     wxControl::SetConstraintSizes(FALSE);
     // don't set the sizes of the pages - their correct size is not yet known
     wxControl::SetConstraintSizes(FALSE);

+#endif

 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)
 }
 
 bool wxNotebook::DoPhase(int /* nPhase */)


@@ -350,9 +427,33 @@ bool wxNotebook::DoPhase(int /* nPhase */)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxNotebook::Command(wxCommandEvent& event)
+bool wxNotebook::OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)

 {
 {

-    wxFAIL_MSG("wxNotebook::Command not implemented");
+  wxNotebookEvent event(wxEVT_NULL, m_windowId);
+//TODO:
+/*
+  NMHDR* hdr = (NMHDR *)lParam;
+  switch ( hdr->code ) {
+    case TCN_SELCHANGE:
+      event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+      break;
+
+    case TCN_SELCHANGING:
+      event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING);
+      break;
+
+    default:
+      return wxControl::MSWOnNotify(idCtrl, lParam, result);
+  }
+*/
+// TODO:    event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
+    event.SetOldSelection(m_nSelection);
+    event.SetEventObject(this);
+    event.SetInt(idCtrl);
+
+    bool processed = GetEventHandler()->ProcessEvent(event);
+// TODO:   *result = !event.IsAllowed();
+    return processed;

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


@@ -362,21 +463,35 @@ void wxNotebook::Command(wxCommandEvent& event)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {

-    wxASSERT( nOldSel != nSel ); // impossible
-
-    if ( nOldSel != -1 ) {
-        m_aPages[nOldSel]->Show(FALSE);
+    // MT-FIXME should use a real semaphore
+    static bool s_bInsideChangePage = FALSE;
+
+    // when we call ProcessEvent(), our own OnSelChange() is called which calls
+    // this function - break the infinite loop
+    if ( s_bInsideChangePage )
+        return;
+
+    // it's not an error (the message may be generated by the tab control itself)
+    // and it may happen - just do nothing
+    if ( nSel == nOldSel )
+        return;
+
+    s_bInsideChangePage = TRUE;
+
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+    event.SetSelection(nSel);
+    event.SetOldSelection(nOldSel);
+    event.SetEventObject(this);
+    if ( ProcessEvent(event) && !event.IsAllowed() )
+    {
+        // program doesn't allow the page change
+        s_bInsideChangePage = FALSE;
+        return;

     }
 
     }
 

-    wxNotebookPage *pPage = m_aPages[nSel];
-    pPage->Show(TRUE);
-    pPage->SetFocus();
+    event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+    ProcessEvent(event);

 
 

-    m_nSelection = nSel;
-}
-
-void wxNotebook::SetTabSize(const wxSize& sz)
-{
-    // TODO
+    s_bInsideChangePage = FALSE;

 }
 
 }