// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "notebook.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/notebook.h"
#if wxUSE_NOTEBOOK
// InsertChild callback for wxNotebook
//-----------------------------------------------------------------------------
-static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
+static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
{
- /* we don't do anything here but pray */
+ // Hack alert! We manually set the child window
+ // parent field so that GTK can query the
+ // notebook's style and font. Without that, GetBestSize could return
+ // incorrect size, see bug #901694 for details
+ // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)
+ child->m_widget->parent = parent->m_widget;
}
//-----------------------------------------------------------------------------
m_inSwitchPage = FALSE;
m_imageList = (wxImageList *) NULL;
- m_pagesData.DeleteContents( TRUE );
m_selection = -1;
m_themeEnabled = TRUE;
}
wxNotebook::~wxNotebook()
{
- /* don't generate change page events any more */
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
- GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
-
DeleteAllPages();
}
return m_selection;
}
-wxString wxNotebook::GetPageText( int page ) const
+wxString wxNotebook::GetPageText( size_t page ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
return wxT("");
}
-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::GetPageImage( size_t page ) const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
return m_pagesData.Item(page)->GetData();
}
-int wxNotebook::SetSelection( int page )
+int wxNotebook::SetSelection( size_t page )
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- wxCHECK_MSG( page < (int)m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
+ wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
int selOld = GetSelection();
return selOld;
}
-bool wxNotebook::SetPageText( int page, const wxString &text )
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
{
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
return TRUE;
}
-bool wxNotebook::SetPageImage( int page, int image )
+bool wxNotebook::SetPageImage( size_t page, int image )
{
/* HvdH 28-12-98: now it works, but it's a bit of a kludge */
return wxNotebookBase::DeleteAllPages();
}
-bool wxNotebook::DeletePage( int page )
+bool wxNotebook::DeletePage( size_t page )
{
- // GTK sets GtkNotebook.cur_page to NULL before sending the switch page
- // event so we have to store the selection internally
- if ( m_selection == -1 )
+ if ( m_selection == (int)m_pagesData.GetCount() - 1 )
{
- m_selection = GetSelection();
- if ( m_selection == (int)m_pagesData.GetCount() - 1 )
- {
- // the index will become invalid after the page is deleted
- m_selection = -1;
- }
+ // the index will become invalid after the page is deleted
+ m_selection = -1;
}
// it will call our DoRemovePage() to do the real work
return wxNotebookBase::DeletePage(page);
}
-wxNotebookPage *wxNotebook::DoRemovePage( int page )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
if ( !client )
gtk_widget_unrealize( client->m_widget );
gtk_widget_unparent( client->m_widget );
+ // gtk_notebook_remove_page() sends "switch_page" signal with some strange
+ // new page index (when deleting selected page 0, new page is 1 although,
+ // clearly, the selection should stay 0), so suppress this
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
+
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
- m_pagesData.DeleteObject(GetNotebookPage(page));
+ gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
+
+ wxGtkNotebookPage* p = GetNotebookPage(page);
+ m_pagesData.DeleteObject(p);
+ delete p;
return client;
}
-bool wxNotebook::InsertPage( int position,
+bool wxNotebook::InsertPage( size_t position,
wxNotebookPage* win,
const wxString& text,
bool select,
wxCHECK_MSG( win->GetParent() == this, FALSE,
wxT("Can't add a page whose parent is not the notebook!") );
- wxCHECK_MSG( position >= 0 && position <= GetPageCount(), FALSE,
+ wxCHECK_MSG( position <= GetPageCount(), FALSE,
_T("invalid page index in wxNotebookPage::InsertPage()") );
- /* don't receive switch page during addition */
+ // Hack alert part II! See above in InsertChildInNotebook
+ // callback why this has to be done.
+ win->m_widget->parent = NULL;
+
+ // don't receive switch page during addition
gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
- if (position < 0)
+#ifndef __VMS
+ // On VMS position is unsigned and thus always positive
+ if (position < 0)
gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
else
- gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
+#endif
+ gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position );
nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
/* set the label text */
nb_page->m_text = text;
if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT("");
-
- nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) );
+
+ nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
-
+
/* show the label */
gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
if (select && (m_pagesData.GetCount() > 1))
{
+#ifndef __VMS
+ // On VMS position is unsigned and thus always positive
if (position < 0)
SetSelection( GetPageCount()-1 );
else
- SetSelection( position );
+#endif
+ SetSelection( position );
}
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
return TRUE;
}
+// helper for HitTest(): check if the point lies inside the given widget which
+// is the child of the notebook whose position and border size are passed as
+// parameters
+static bool
+IsPointInsideWidget(const wxPoint& pt, GtkWidget *w,
+ gint x, gint y, gint border = 0)
+{
+ return
+ (pt.x >= w->allocation.x - x - border) &&
+ (pt.x <= w->allocation.x - x + border + w->allocation.width) &&
+ (pt.y >= w->allocation.y - y - border) &&
+ (pt.y <= w->allocation.y - y + border + w->allocation.height);
+}
+
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
+{
+ const gint x = m_widget->allocation.x;
+ const gint y = m_widget->allocation.y;
+
+ const size_t count = GetPageCount();
+ for ( size_t i = 0; i < count; i++ )
+ {
+ wxGtkNotebookPage* nb_page = GetNotebookPage(i);
+ GtkWidget *box = nb_page->m_box;
+
+ // VZ: don't know how to find the border width in GTK+ 1.2
+#ifdef __WXGTK20__
+ const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
+#else // !GTK+ 2.x
+ const gint border = 0;
+#endif
+ if ( IsPointInsideWidget(pt, box, x, y, border) )
+ {
+ // ok, we're inside this tab -- now find out where, if needed
+ if ( flags )
+ {
+ GtkWidget *pixmap = NULL;
+
+ GList *children = gtk_container_children(GTK_CONTAINER(box));
+ for ( GList *child = children; child; child = child->next )
+ {
+ if ( GTK_IS_PIXMAP(child->data) )
+ {
+ pixmap = GTK_WIDGET(child->data);
+ break;
+ }
+ }
+
+ if ( children )
+ g_list_free(children);
+
+ if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
+ {
+ *flags = wxNB_HITTEST_ONICON;
+ }
+ else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
+ {
+ *flags = wxNB_HITTEST_ONLABEL;
+ }
+ else
+ {
+ *flags = wxNB_HITTEST_ONITEM;
+ }
+ }
+
+ return i;
+ }
+ }
+
+ if ( flags )
+ *flags = wxNB_HITTEST_NOWHERE;
+
+ return wxNOT_FOUND;
+}
+
void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
{
if (event.IsWindowChange())
projects / wxWidgets.git / blobdiff