/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.cpp
+// Name: src/gtk/notebook.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
-
-#include "wx/notebook.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
-#include "wx/imaglist.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-#include "gdk/gdkkeysyms.h"
+#if wxUSE_NOTEBOOK
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/notebook.h"
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/msgdlg.h"
+ #include "wx/bitmap.h"
+#endif
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#include "wx/imaglist.h"
+#include "wx/fontutil.h"
-extern bool g_blockEventsOnDrag;
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
-// debug
+// wxGtkNotebookPage
//-----------------------------------------------------------------------------
-#ifdef __WXDEBUG__
-
-extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+// VZ: this is rather ugly as we keep the pages themselves in an array (it
+// allows us to have quite a few functions implemented in the base class)
+// but the page data is kept in a separate list, so we must maintain them
+// in sync manually... of course, the list had been there before the base
+// class which explains it but it still would be nice to do something
+// about this one day
-#endif
-
-//-----------------------------------------------------------------------------
-// wxNotebookPage
-//-----------------------------------------------------------------------------
-
-class wxNotebookPage: public wxObject
+class wxGtkNotebookPage: public wxObject
{
public:
- wxNotebookPage()
- {
- m_id = -1;
- m_text = "";
- m_image = -1;
- m_page = (GtkNotebookPage *) NULL;
- m_client = (wxWindow *) NULL;
- m_parent = (GtkNotebook *) NULL;
- m_box = (GtkWidget *) NULL;
- m_added = FALSE;
- }
-
- /*
- mark page as "added' to the notebook, return FALSE if the page was
- already added
- */
-
- bool Add()
- {
- if ( WasAdded() )
- return FALSE;
-
- m_added = TRUE;
- return TRUE;
- }
-
- bool WasAdded() const { return m_added; }
-
- int m_id;
- wxString m_text;
- int m_image;
- GtkNotebookPage *m_page;
- GtkLabel *m_label;
- wxWindow *m_client;
- GtkNotebook *m_parent;
- GtkWidget *m_box; // in which the label and image are packed
-
-private:
- bool m_added;
+ GtkWidget* m_box;
+ GtkWidget* m_label;
+ GtkWidget* m_image;
+ int m_imageIndex;
};
-//-----------------------------------------------------------------------------
-// "switch_page"
-//-----------------------------------------------------------------------------
-
-static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
- GtkNotebookPage *WXUNUSED(page),
- gint nPage,
- gpointer data)
-{
- if (g_isIdle) wxapp_install_idle_handler();
-
- wxNotebook *notebook = (wxNotebook *)data;
- int old = notebook->GetSelection();
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGtkNotebookPagesList)
- // TODO: emulate PAGE_CHANGING event
-
- wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- notebook->GetId(), nPage, old );
- event.SetEventObject( notebook );
- notebook->GetEventHandler()->ProcessEvent( event );
+extern "C" {
+static void event_after(GtkNotebook*, GdkEvent*, wxNotebook*);
}
//-----------------------------------------------------------------------------
-// "size_allocate"
+// "switch_page"
//-----------------------------------------------------------------------------
-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+extern "C" {
+static void
+switch_page_after(GtkWidget* widget, GtkNotebookPage*, guint, wxNotebook* win)
{
- if (g_isIdle) wxapp_install_idle_handler();
-
- if ((win->m_x == alloc->x) &&
- (win->m_y == alloc->y) &&
- (win->m_width == alloc->width) &&
- (win->m_height == alloc->height))
- {
- return;
- }
-
- win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
+ g_signal_handlers_block_by_func(widget, (void*)switch_page_after, win);
+ win->SendPageChangedEvent(win->m_oldSelection);
+}
+}
+
+extern "C" {
+static void
+switch_page(GtkNotebook* widget, GtkNotebookPage*, int page, wxNotebook* win)
+{
+ win->m_oldSelection = gtk_notebook_get_current_page(widget);
- if (win->GetAutoLayout()) win->Layout();
+ if (win->SendPageChangingEvent(page))
+ // allow change, unblock handler for changed event
+ g_signal_handlers_unblock_by_func(widget, (void*)switch_page_after, win);
+ else
+ // change vetoed, unblock handler to set selection back
+ g_signal_handlers_unblock_by_func(widget, (void*)event_after, win);
+}
}
//-----------------------------------------------------------------------------
-// "key_press_event"
+// "event_after" from m_widget
//-----------------------------------------------------------------------------
-static gint
-gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook )
+extern "C" {
+static void event_after(GtkNotebook* widget, GdkEvent*, wxNotebook* win)
{
- if (g_isIdle) wxapp_install_idle_handler();
+ g_signal_handlers_block_by_func(widget, (void*)event_after, win);
+ g_signal_handlers_block_by_func(widget, (void*)switch_page, win);
- if (g_blockEventsOnDrag) return FALSE;
+ // restore previous selection
+ gtk_notebook_set_current_page(widget, win->m_oldSelection);
- if (!notebook->HasVMT()) return FALSE;
-
- /* this code makes jumping down from the handles of the notebooks
- to the actual items in the visible notebook page possible with
- the down-arrow key */
-
- if (gdk_event->keyval != GDK_Down) return FALSE;
-
- if (notebook != notebook->FindFocus()) return FALSE;
-
- if (notebook->m_pages.GetCount() == 0) return FALSE;
-
- wxNode *node = notebook->m_pages.Nth( notebook->GetSelection() );
-
- if (!node) return FALSE;
-
- wxNotebookPage *page = (wxNotebookPage*) node->Data();
-
- // don't let others the key event
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
-
- page->m_client->SetFocus();
-
- return TRUE;
+ g_signal_handlers_unblock_by_func(widget, (void*)switch_page, win);
+}
}
//-----------------------------------------------------------------------------
// InsertChild callback for wxNotebook
//-----------------------------------------------------------------------------
-static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+void wxNotebook::AddChildGTK(wxWindowGTK* child)
{
- wxNotebookPage *page = new wxNotebookPage();
+ // Hack Alert! (Part I): This sets the notebook as the parent of the child
+ // widget, and takes care of some details such as updating the state and
+ // style of the child to reflect its new location. We do this early
+ // because without it GetBestSize (which is used to set the initial size
+ // of controls if an explicit size is not given) will often report
+ // incorrect sizes since the widget's style context is not fully known.
+ // See bug #901694 for details
+ // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863)
+ gtk_widget_set_parent(child->m_widget, m_widget);
- page->m_id = parent->GetPageCount();
-
- page->m_box = gtk_hbox_new (FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
-
- GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-
- page->m_client = child;
- gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
-
- page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-
- page->m_parent = notebook;
-
- gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-
- wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );
-
- parent->m_pages.Append( page );
+ // NOTE: This should be considered a temporary workaround until we can
+ // work out the details and implement delaying the setting of the initial
+ // size of widgets until the size is really needed.
}
//-----------------------------------------------------------------------------
// wxNotebook
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase)
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
END_EVENT_TABLE()
void wxNotebook::Init()
{
- m_imageList = (wxImageList *) NULL;
- m_pages.DeleteContents( TRUE );
- m_idHandler = 0;
+ m_padding = 0;
+ m_oldSelection = -1;
+ m_themeEnabled = true;
}
wxNotebook::wxNotebook()
wxNotebook::~wxNotebook()
{
- // don't generate change page events any more
- if (m_idHandler != 0)
- gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
-
DeleteAllPages();
}
bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name )
+ const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
- m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+ if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+ style |= wxBK_TOP;
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxNoteBook creation failed") );
+ return false;
+ }
- m_widget = gtk_notebook_new();
-#ifdef __WXDEBUG__
- debug_focus_in( m_widget, _T("wxNotebook::m_widget"), name );
-#endif
+ m_widget = gtk_notebook_new();
+ g_object_ref(m_widget);
gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
- m_idHandler = gtk_signal_connect (
- GTK_OBJECT(m_widget), "switch_page",
- GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback),
- (gpointer)this );
+ g_signal_connect (m_widget, "switch_page",
+ G_CALLBACK(switch_page), this);
- m_parent->AddChild( this );
+ g_signal_connect_after (m_widget, "switch_page",
+ G_CALLBACK(switch_page_after), this);
+ g_signal_handlers_block_by_func(m_widget, (void*)switch_page_after, this);
- (m_parent->m_insertCallback)( m_parent, this );
+ g_signal_connect(m_widget, "event_after", G_CALLBACK(event_after), this);
+ g_signal_handlers_block_by_func(m_widget, (void*)event_after, this);
- gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
- GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );
+ m_parent->DoAddChild( this );
- PostCreation();
+ if (m_windowStyle & wxBK_RIGHT)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
+ if (m_windowStyle & wxBK_LEFT)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
+ if (m_windowStyle & wxBK_BOTTOM)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
- Show( TRUE );
+ PostCreation(size);
- return TRUE;
+ return true;
}
int wxNotebook::GetSelection() const
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
-
- if (m_pages.Number() == 0) return -1;
-
- GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
- if (!g_page) return -1;
-
- wxNotebookPage *page = (wxNotebookPage *) NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxNotebookPage*)node->Data();
-
- if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL))
- {
- // page->m_page is NULL directly after gtk_notebook_append. gtk emits
- // "switch_page" then and we ask for GetSelection() in the handler for
- // "switch_page". otherwise m_page should never be NULL. all this
- // might also be wrong.
- break;
- }
- node = node->Next();
- }
-
- wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- return page->m_id;
+ return gtk_notebook_get_current_page( GTK_NOTEBOOK(m_widget) );
}
-int wxNotebook::GetPageCount() const
+wxString wxNotebook::GetPageText( size_t page ) const
{
- // count only the pages which were already added to the notebook for MSW
- // compatibility (and, in fact, this behaviour makes more sense anyhow
- // because only the added pages are shown)
-
- int n = 0;
- for ( wxNode *node = m_pages.First(); node; node = node->Next() )
- {
- wxNotebookPage *page = (wxNotebookPage*)node->Data();
-
- if (page->WasAdded()) n++;
- }
+ wxCHECK_MSG(page < GetPageCount(), wxEmptyString, "invalid notebook index");
- return n;
+ GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+ return wxGTK_CONV_BACK(gtk_label_get_text(label));
}
-int wxNotebook::GetRowCount() const
+int wxNotebook::GetPageImage( size_t page ) const
{
- return 1;
+ wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
+
+ return GetNotebookPage(page)->m_imageIndex;
}
-wxString wxNotebook::GetPageText( int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") );
-
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (nb_page)
- return nb_page->m_text;
- else
- return "";
+ return m_pagesData.Item(page)->GetData();
}
-int wxNotebook::GetPageImage( int page ) const
+int wxNotebook::DoSetSelection( size_t page, int flags )
{
- wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") );
+ wxCHECK_MSG(page < GetPageCount(), -1, "invalid notebook index");
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (nb_page)
- return nb_page->m_image;
- else
- return 0;
-}
+ int selOld = GetSelection();
-wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") );
+ if ( !(flags & SetSelection_SendEvent) )
+ {
+ g_signal_handlers_block_by_func(m_widget, (void*)switch_page, this);
+ }
- wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
+ gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
- wxNode *node = m_pages.First();
- while (node)
+ if ( !(flags & SetSelection_SendEvent) )
{
- nb_page = (wxNotebookPage*)node->Data();
- if (nb_page->m_id == page)
- return nb_page;
- node = node->Next();
+ g_signal_handlers_unblock_by_func(m_widget, (void*)switch_page, this);
}
- wxFAIL_MSG( _T("Notebook page not found!") );
+ wxNotebookPage *client = GetPage(page);
+ if ( client )
+ client->SetFocus();
- return (wxNotebookPage *) NULL;
+ return selOld;
}
-int wxNotebook::SetSelection( int page )
+bool wxNotebook::SetPageText( size_t page, const wxString &text )
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") );
+ wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");
- int selOld = GetSelection();
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ GtkLabel* label = GTK_LABEL(GetNotebookPage(page)->m_label);
+ gtk_label_set_text(label, wxGTK_CONV(text));
- if (!nb_page) return -1;
+ return true;
+}
+
+bool wxNotebook::SetPageImage( size_t page, int image )
+{
+ wxCHECK_MSG(page < GetPageCount(), false, "invalid notebook index");
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
+ wxGtkNotebookPage* pageData = GetNotebookPage(page);
+ if (image >= 0)
+ {
+ wxCHECK_MSG(m_imageList, false, "invalid notebook imagelist");
+ const wxBitmap* bitmap = m_imageList->GetBitmapPtr(image);
+ if (bitmap == NULL)
+ return false;
+ if (pageData->m_image)
+ {
+ gtk_image_set_from_pixbuf(
+ GTK_IMAGE(pageData->m_image), bitmap->GetPixbuf());
+ }
+ else
+ {
+ pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+ gtk_widget_show(pageData->m_image);
+ gtk_box_pack_start(GTK_BOX(pageData->m_box),
+ pageData->m_image, false, false, m_padding);
+ }
+ }
+ else if (pageData->m_image)
{
- if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
+ gtk_widget_destroy(pageData->m_image);
+ pageData->m_image = NULL;
}
+ pageData->m_imageIndex = image;
- if (!child) return -1;
-
- gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+ return true;
+}
- return selOld;
+void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
+{
+ wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
}
-void wxNotebook::AdvanceSelection( bool bForward )
+void wxNotebook::SetPadding( const wxSize &padding )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid notebook") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
- int sel = GetSelection();
- int max = GetPageCount();
+ m_padding = padding.GetWidth();
- if (bForward)
- SetSelection( sel == max ? 0 : sel + 1 );
- else
- SetSelection( sel == 0 ? max-1 : sel - 1 );
+ for (size_t i = GetPageCount(); i--;)
+ {
+ wxGtkNotebookPage* pageData = GetNotebookPage(i);
+ if (pageData->m_image)
+ {
+ gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+ pageData->m_image, false, false, m_padding, GTK_PACK_START);
+ }
+ gtk_box_set_child_packing(GTK_BOX(pageData->m_box),
+ pageData->m_label, false, false, m_padding, GTK_PACK_END);
+ }
}
-void wxNotebook::SetImageList( wxImageList* imageList )
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
{
- m_imageList = imageList;
+ wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
}
-bool wxNotebook::SetPageText( int page, const wxString &text )
+bool wxNotebook::DeleteAllPages()
{
- wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
-
- wxNotebookPage* nb_page = GetNotebookPage(page);
-
- wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") );
-
- nb_page->m_text = text;
+ for (size_t i = GetPageCount(); i--;)
+ DeletePage(i);
- gtk_label_set(nb_page->m_label, nb_page->m_text.mbc_str());
-
- return TRUE;
+ return wxNotebookBase::DeleteAllPages();
}
-bool wxNotebook::SetPageImage( int page, int image )
+wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
- /* HvdH 28-12-98: now it works, but it's a bit of a kludge */
+ // We cannot remove the page yet, as GTK sends the "switch_page"
+ // signal before it has removed the notebook-page from its
+ // corresponding list. Thus, if we were to remove the page from
+ // m_pages at this point, the two lists of pages would be out
+ // of sync during the PAGE_CHANGING/PAGE_CHANGED events.
+ wxNotebookPage *client = GetPage(page);
+ if ( !client )
+ return NULL;
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ gtk_widget_unrealize( client->m_widget );
- if (!nb_page) return FALSE;
+ // we don't need to unparent the client->m_widget; GTK+ will do
+ // that for us (and will throw a warning if we do it!)
+ gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
- /* Optimization posibility: return immediately if image unchanged.
- * Not enabled because it may break existing (stupid) code that
- * manipulates the imagelist to cycle images */
+ // It's safe to remove the page now.
+ wxASSERT_MSG(GetPage(page) == client, wxT("pages changed during delete"));
+ wxNotebookBase::DoRemovePage(page);
- /* if (image == nb_page->m_image) return TRUE; */
+ wxGtkNotebookPage* p = GetNotebookPage(page);
+ m_pagesData.DeleteObject(p);
+ delete p;
+
+ return client;
+}
- /* For different cases:
- 1) no image -> no image
- 2) image -> no image
- 3) no image -> image
- 4) image -> image */
+bool wxNotebook::InsertPage( size_t position,
+ wxNotebookPage* win,
+ const wxString& text,
+ bool select,
+ int imageId )
+{
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid notebook") );
- if (image == -1 && nb_page->m_image == -1)
- return TRUE; /* Case 1): Nothing to do. */
+ wxCHECK_MSG( win->GetParent() == this, false,
+ wxT("Can't add a page whose parent is not the notebook!") );
- GtkWidget *pixmapwid = (GtkWidget*) NULL;
+ wxCHECK_MSG( position <= GetPageCount(), false,
+ _T("invalid page index in wxNotebookPage::InsertPage()") );
- if (nb_page->m_image != -1)
- {
- /* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */
-
- GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
- while (child)
- {
- if (GTK_IS_PIXMAP(child->data))
- {
- pixmapwid = GTK_WIDGET(child->data);
- break;
- }
- child = child->next;
- }
+ // Hack Alert! (Part II): See above in wxNotebook::AddChildGTK
+ // why this has to be done.
+ gtk_widget_unparent(win->m_widget);
- /* We should have the pixmap widget now */
- wxASSERT(pixmapwid != NULL);
+ if (m_themeEnabled)
+ win->SetThemeEnabled(true);
- if (image == -1)
- {
- /* If there's no new widget, just remove the old from the box */
- gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
- nb_page->m_image = -1;
+ GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
- return TRUE; /* Case 2) */
- }
- }
+ wxGtkNotebookPage* pageData = new wxGtkNotebookPage;
- /* Only cases 3) and 4) left */
- wxASSERT( m_imageList != NULL ); /* Just in case */
+ m_pages.Insert(win, position);
+ m_pagesData.Insert(position, pageData);
- /* Construct the new pixmap */
- const wxBitmap *bmp = m_imageList->GetBitmap(image);
- GdkPixmap *pixmap = bmp->GetPixmap();
- GdkBitmap *mask = (GdkBitmap*) NULL;
- if ( bmp->GetMask() )
- {
- mask = bmp->GetMask()->GetBitmap();
- }
+ // set the label image and text
+ // this must be done before adding the page, as GetPageText
+ // and GetPageImage will otherwise return wrong values in
+ // the page-changed event that results from inserting the
+ // first page.
+ pageData->m_imageIndex = imageId;
- if (pixmapwid == NULL)
- {
- /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
- pixmapwid = gtk_pixmap_new (pixmap, mask );
+ pageData->m_box = gtk_hbox_new(false, 1);
+ gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2);
- /* CHECKME: Are these pack flags okay? */
- gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
- gtk_widget_show(pixmapwid);
- }
- else
+ pageData->m_image = NULL;
+ if (imageId != -1)
{
- /* Case 4) Simply replace the pixmap */
- gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
+ if (m_imageList)
+ {
+ const wxBitmap* bitmap = m_imageList->GetBitmapPtr(imageId);
+ pageData->m_image = gtk_image_new_from_pixbuf(bitmap->GetPixbuf());
+ gtk_box_pack_start(GTK_BOX(pageData->m_box),
+ pageData->m_image, false, false, m_padding);
+ }
+ else
+ wxFAIL_MSG("invalid notebook imagelist");
}
- nb_page->m_image = image;
-
- return TRUE;
-}
+ /* set the label text */
+ pageData->m_label = gtk_label_new(wxGTK_CONV(wxStripMenuCodes(text)));
+ gtk_box_pack_end(GTK_BOX(pageData->m_box),
+ pageData->m_label, false, false, m_padding);
-void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
-{
- wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") );
-}
-
-void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
-{
- wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") );
-}
-
-void wxNotebook::SetTabSize(const wxSize& sz)
-{
- wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") );
-}
-
-bool wxNotebook::DeleteAllPages()
-{
- wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
+ gtk_widget_show_all(pageData->m_box);
+ gtk_notebook_insert_page(notebook, win->m_widget, pageData->m_box, position);
- wxNode *page_node = m_pages.First();
- while (page_node)
+ /* apply current style */
+ GtkRcStyle *style = CreateWidgetStyle();
+ if ( style )
{
- wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
-
- DeletePage( page->m_id );
-
- page_node = m_pages.First();
+ gtk_widget_modify_style(pageData->m_label, style);
+ gtk_rc_style_unref(style);
}
- return TRUE;
-}
-
-bool wxNotebook::DeletePage( int page )
-{
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page) return FALSE;
-
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
+ if (select && GetPageCount() > 1)
{
- if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
+ SetSelection( position );
}
- wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
-
- delete nb_page->m_client;
-
- m_pages.DeleteObject( nb_page );
-
- return TRUE;
+ InvalidateBestSize();
+ return true;
}
-bool wxNotebook::RemovePage( int page )
+// 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)
{
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page) return FALSE;
-
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
- }
-
- wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") );
-
- gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
-
- m_pages.DeleteObject( nb_page );
-
- return TRUE;
+ 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);
}
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
- bool select, int imageId)
+int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
{
- wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") );
+ const gint x = m_widget->allocation.x;
+ const gint y = m_widget->allocation.y;
- /* we've created the notebook page in AddChild(). Now we just have to set
- the caption for the page and set the others parameters. */
+ const size_t count = GetPageCount();
+ size_t i = 0;
- wxNotebookPage *page = (wxNotebookPage *) NULL;
+ GtkNotebook * notebook = GTK_NOTEBOOK(m_widget);
+ if (gtk_notebook_get_scrollable(notebook))
+ i = g_list_position( notebook->children, notebook->first_tab );
- wxNode *node = m_pages.First();
- while (node)
+ for ( ; i < count; i++ )
{
- page = (wxNotebookPage*)node->Data();
- if ( page->m_client == win ) break;
- node = node->Next();
- }
+ wxGtkNotebookPage* pageData = GetNotebookPage(i);
+ GtkWidget* box = pageData->m_box;
- wxCHECK_MSG( page != NULL, FALSE,
- _T("Can't add a page whose parent is not the notebook!") );
+ const gint border = gtk_container_get_border_width(GTK_CONTAINER(box));
- wxCHECK_MSG( page->Add(), FALSE,
- _T("Can't add the same page twice to a notebook.") );
+ if ( IsPointInsideWidget(pt, box, x, y, border) )
+ {
+ // ok, we're inside this tab -- now find out where, if needed
+ if ( flags )
+ {
+ if (pageData->m_image && IsPointInsideWidget(pt, pageData->m_image, x, y))
+ {
+ *flags = wxBK_HITTEST_ONICON;
+ }
+ else if (IsPointInsideWidget(pt, pageData->m_label, x, y))
+ {
+ *flags = wxBK_HITTEST_ONLABEL;
+ }
+ else
+ {
+ *flags = wxBK_HITTEST_ONITEM;
+ }
+ }
- if (imageId != -1)
- {
- wxASSERT( m_imageList != NULL );
+ return i;
+ }
+ }
- const wxBitmap *bmp = m_imageList->GetBitmap(imageId);
- GdkPixmap *pixmap = bmp->GetPixmap();
- GdkBitmap *mask = (GdkBitmap*) NULL;
- if ( bmp->GetMask() )
+ if ( flags )
+ {
+ *flags = wxBK_HITTEST_NOWHERE;
+ wxWindowBase * page = GetCurrentPage();
+ if ( page )
{
- mask = bmp->GetMask()->GetBitmap();
+ // rect origin is in notebook's parent coordinates
+ wxRect rect = page->GetRect();
+
+ // adjust it to the notebook's coordinates
+ wxPoint pos = GetPosition();
+ rect.x -= pos.x;
+ rect.y -= pos.y;
+ if ( rect.Contains( pt ) )
+ *flags |= wxBK_HITTEST_ONPAGE;
}
-
- GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
-
- gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
-
- gtk_widget_show(pixmapwid);
}
- /* then set the attributes */
- page->m_text = text;
- if (page->m_text.IsEmpty()) page->m_text = _T("");
- page->m_image = imageId;
- page->m_label = (GtkLabel *)gtk_label_new(page->m_text.mbc_str());
- gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
-
- /* @@@: what does this do? do we still need it?
- gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
-
- gtk_widget_show((GtkWidget *)page->m_label);
-
- if (select) SetSelection( GetPageCount()-1 );
-
- return TRUE;
+ return wxNOT_FOUND;
}
void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
event.Skip();
}
-wxWindow *wxNotebook::GetPage( int page ) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") );
-
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page)
- return (wxWindow *) NULL;
- else
- return nb_page->m_client;
-}
+#if wxUSE_CONSTRAINTS
// override these 2 functions to do nothing: everything is done in OnSize
void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
{
// don't set the sizes of the pages - their correct size is not yet known
- wxControl::SetConstraintSizes(FALSE);
+ wxControl::SetConstraintSizes(false);
}
bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
{
- return TRUE;
+ return true;
}
-void wxNotebook::ApplyWidgetStyle()
+#endif
+
+void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ gtk_widget_modify_style(m_widget, style);
+ for (size_t i = GetPageCount(); i--;)
+ gtk_widget_modify_style(GetNotebookPage(i)->m_label, style);
}
-//-----------------------------------------------------------------------------
-// wxNotebookEvent
-//-----------------------------------------------------------------------------
+GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+ windows.push_back(m_widget->window);
+ windows.push_back(GTK_NOTEBOOK(m_widget)->event_window);
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+ return NULL;
+}
+// static
+wxVisualAttributes
+wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
+}
+
+#endif
projects / wxWidgets.git / blobdiff