// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "notebook.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "univnotebook.h"
+#endif
+
+#ifdef __VMS
+#pragma message disable unscomzer
#endif
#include "wx/wxprec.h"
// macros
// ----------------------------------------------------------------------------
-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#if 0
+// due to unsigned type nPage is always >= 0
+#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((size_t(nPage)) < GetPageCount()))
+#else
+#define IS_VALID_PAGE(nPage) ((size_t(nPage)) < GetPageCount())
+#endif
// ----------------------------------------------------------------------------
// constants
// wxNotebook page titles and images
// ----------------------------------------------------------------------------
-wxString wxNotebook::GetPageText(int nPage) const
+wxString wxNotebook::GetPageText(size_t nPage) const
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("invalid notebook page") );
return m_titles[nPage];
}
-bool wxNotebook::SetPageText(int nPage, const wxString& strText)
+bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
return TRUE;
}
-int wxNotebook::GetPageImage(int nPage) const
+int wxNotebook::GetPageImage(size_t nPage) const
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
return m_images[nPage];
}
-bool wxNotebook::SetPageImage(int nPage, int nImage)
+bool wxNotebook::SetPageImage(size_t nPage, int nImage)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
// wxNotebook page switching
// ----------------------------------------------------------------------------
-int wxNotebook::SetSelection(int nPage)
+int wxNotebook::SetSelection(size_t nPage)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
return m_sel;
}
- if ( m_sel != INVALID_PAGE )
+ // event handling
+ wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
+ event.SetSelection(nPage);
+ event.SetOldSelection(m_sel);
+ event.SetEventObject(this);
+ if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
{
- RefreshTab(m_sel);
-
- m_pages[m_sel]->Hide();
+ // program doesn't allow the page change
+ return m_sel;
}
+ // we need to change m_sel first, before calling RefreshTab() below as
+ // otherwise the previously selected tab wouldn't be redrawn properly under
+ // wxGTK which calls Refresh() immediately and not during the next event
+ // loop iteration as wxMSW does and as it should
+ size_t selOld = m_sel;
+
m_sel = nPage;
+ if ( selOld != INVALID_PAGE )
+ {
+ RefreshTab(selOld, TRUE /* this tab was selected */);
+
+ m_pages[selOld]->Hide();
+ }
+
if ( m_sel != INVALID_PAGE ) // this is impossible - but test nevertheless
{
if ( HasSpinBtn() )
m_pages[m_sel]->Show();
}
- return m_sel;
-}
-
-void wxNotebook::ChangePage(int nPage)
-{
- wxCHECK_RET( IS_VALID_PAGE(nPage), _T("invalid notebook page") );
-
- if ( (size_t)nPage == m_sel )
- {
- // nothing to do
- return;
- }
-
- wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
- event.SetSelection(nPage);
- event.SetOldSelection(m_sel);
- event.SetEventObject(this);
- if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
- {
- // program doesn't allow the page change
- return;
- }
-
- SetSelection(nPage);
-
+ // event handling
event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
GetEventHandler()->ProcessEvent(event);
+
+ return selOld;
}
// ----------------------------------------------------------------------------
// wxNotebook pages adding/deleting
// ----------------------------------------------------------------------------
-bool wxNotebook::InsertPage(int nPage,
+bool wxNotebook::InsertPage(size_t nPage,
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect,
int imageId)
{
- int nPages = GetPageCount();
+ size_t nPages = GetPageCount();
wxCHECK_MSG( nPage == nPages || IS_VALID_PAGE(nPage), FALSE,
_T("invalid notebook page in InsertPage()") );
bSelect = TRUE;
Relayout();
+ Refresh();
}
else // not the first tab
{
return TRUE;
}
-wxNotebookPage *wxNotebook::DoRemovePage(int nPage)
+wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, _T("invalid notebook page") );
m_images.RemoveAt(nPage);
// the spin button might not be needed any more
- if ( HasSpinBtn() )
+ // 2002-08-12 'if' commented out by JACS on behalf
+ // of Hans Van Leemputten <Hansvl@softhome.net> who
+ // points out that UpdateSpinBtn should always be called,
+ // to ensure m_lastVisible is up to date.
+ // if ( HasSpinBtn() )
{
UpdateSpinBtn();
}
- int count = GetPageCount();
+ size_t count = GetPageCount();
if ( count )
{
if ( m_sel == (size_t)nPage )
}
}
-void wxNotebook::RefreshTab(int page)
+void wxNotebook::RefreshTab(int page, bool forceSelected)
{
wxCHECK_RET( IS_VALID_PAGE(page), _T("invalid notebook page") );
wxRect rect = GetTabRect(page);
- if ( (size_t)page == m_sel )
+ if ( forceSelected || ((size_t)page == m_sel) )
{
const wxSize indent = GetRenderer()->GetTabIndent();
rect.Inflate(indent.x, indent.y);
{
int image = m_images[n];
-#ifdef __WXMSW__ // FIXME
+ // Not needed now that wxGenericImageList is being
+ // used for wxUniversal under MSW
+#if 0 // def __WXMSW__ // FIXME
int w, h;
m_imageList->GetSize(n, w, h);
bmp.Create(w, h);
dc.SelectObject(bmp);
dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, TRUE);
+ dc.SelectObject(wxNullBitmap);
#else
bmp = *m_imageList->GetBitmap(image);
#endif
wxSize sizeSpinBtn = m_spinbtn->GetSize();
if ( IsVertical() )
+ {
rectTabs.height -= sizeSpinBtn.y;
+
+ // Allow for erasing the line under selected tab
+ rectTabs.width += 2;
+ }
else
+ {
rectTabs.width -= sizeSpinBtn.x;
+ // Allow for erasing the line under selected tab
+ rectTabs.height += 2;
+ }
+
dc.SetClippingRegion(rectTabs);
}
{
DoDrawTab(dc, rectSel, m_sel);
}
+
+ dc.DestroyClippingRegion();
}
// ----------------------------------------------------------------------------
// wxNotebook geometry
// ----------------------------------------------------------------------------
-int wxNotebook::HitTest(const wxPoint& pt) const
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
{
+ if ( flags )
+ *flags = wxNB_HITTEST_NOWHERE;
+
// first check that it is in this window at all
if ( !GetClientRect().Inside(pt) )
{
GetTabSize(n, &rectTabs.width, &rectTabs.height);
if ( rectTabs.Inside(pt) )
+ {
+ if ( flags )
+ {
+ // TODO: be more precise
+ *flags = wxNB_HITTEST_ONITEM;
+ }
+
return n;
+ }
// move the rectTabs to the next tab
if ( IsVertical() )
SetClientSize(GetSizeForPage(size));
}
-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
{
return AdjustSize(GetSizeForPage(sizePage));
}
int width, int height,
int sizeFlags)
{
- wxControl::DoSetSize(x, y, width, height, sizeFlags);
+ wxSize old_client_size = GetClientSize();
- Relayout();
+ wxControl::DoSetSize(x, y, width, height, sizeFlags);
+
+ wxSize new_client_size = GetClientSize();
+
+ if (old_client_size != new_client_size)
+ Relayout();
}
// ----------------------------------------------------------------------------
const wxString& strArg)
{
if ( action == wxACTION_NOTEBOOK_NEXT )
- ChangePage(GetNextPage(TRUE));
+ SetSelection(GetNextPage(TRUE));
else if ( action == wxACTION_NOTEBOOK_PREV )
- ChangePage(GetNextPage(FALSE));
+ SetSelection(GetNextPage(FALSE));
else if ( action == wxACTION_NOTEBOOK_GOTO )
- ChangePage((int)numArg);
+ SetSelection((int)numArg);
else
return wxControl::PerformAction(action, numArg, strArg);
{
}
-bool wxStdNotebookInputHandler::HandleKey(wxControl *control,
+bool wxStdNotebookInputHandler::HandleKey(wxInputConsumer *consumer,
const wxKeyEvent& event,
bool pressed)
{
// ignore the key releases
if ( pressed )
{
- wxNotebook *notebook = wxStaticCast(control, wxNotebook);
+ wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook);
int page = 0;
wxControlAction action;
if ( !!action )
{
- return control->PerformAction(action, page);
+ return consumer->PerformAction(action, page);
}
}
- return wxStdInputHandler::HandleKey(control, event, pressed);
+ return wxStdInputHandler::HandleKey(consumer, event, pressed);
}
-bool wxStdNotebookInputHandler::HandleMouse(wxControl *control,
+bool wxStdNotebookInputHandler::HandleMouse(wxInputConsumer *consumer,
const wxMouseEvent& event)
{
if ( event.ButtonDown(1) )
{
- wxNotebook *notebook = wxStaticCast(control, wxNotebook);
+ wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook);
int page = notebook->HitTest(event.GetPosition());
if ( page != -1 )
{
- control->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
+ consumer->PerformAction(wxACTION_NOTEBOOK_GOTO, page);
return FALSE;
}
}
- return wxStdInputHandler::HandleMouse(control, event);
+ return wxStdInputHandler::HandleMouse(consumer, event);
}
-bool wxStdNotebookInputHandler::HandleMouseMove(wxControl *control,
+bool wxStdNotebookInputHandler::HandleMouseMove(wxInputConsumer *consumer,
const wxMouseEvent& event)
{
- return wxStdInputHandler::HandleMouseMove(control, event);
+ return wxStdInputHandler::HandleMouseMove(consumer, event);
}
-bool wxStdNotebookInputHandler::HandleFocus(wxControl *control,
- const wxFocusEvent& event)
+bool
+wxStdNotebookInputHandler::HandleFocus(wxInputConsumer *consumer,
+ const wxFocusEvent& WXUNUSED(event))
{
- HandleFocusChange(control);
+ HandleFocusChange(consumer);
return FALSE;
}
-bool wxStdNotebookInputHandler::HandleActivation(wxControl *control,
+bool wxStdNotebookInputHandler::HandleActivation(wxInputConsumer *consumer,
bool WXUNUSED(activated))
{
// we react to the focus change in the same way as to the [de]activation
- HandleFocusChange(control);
+ HandleFocusChange(consumer);
return FALSE;
}
-void wxStdNotebookInputHandler::HandleFocusChange(wxControl *control)
+void wxStdNotebookInputHandler::HandleFocusChange(wxInputConsumer *consumer)
{
- wxNotebook *notebook = wxStaticCast(control, wxNotebook);
+ wxNotebook *notebook = wxStaticCast(consumer->GetInputWindow(), wxNotebook);
notebook->RefreshCurrent();
}
projects / wxWidgets.git / blobdiff