#include "wx/gtk/win_gtk.h"
#include <gdk/gdkkeysyms.h>
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
#endif
//-----------------------------------------------------------------------------
-// wxNotebookPage
+// wxGtkNotebookPage
//-----------------------------------------------------------------------------
-class wxNotebookPage: public wxObject
+class wxGtkNotebookPage: public wxObject
{
public:
- wxNotebookPage()
+ wxGtkNotebookPage()
{
m_text = "";
m_image = -1;
m_page = (GtkNotebookPage *) NULL;
- m_client = (wxWindow *) NULL;
+ m_client = (wxNotebookPage *) NULL;
m_box = (GtkWidget *) NULL;
}
int m_image;
GtkNotebookPage *m_page;
GtkLabel *m_label;
- wxWindow *m_client;
+ wxNotebookPage *m_client;
GtkWidget *m_box; // in which the label and image are packed
};
gint page,
wxNotebook *notebook )
{
+ static bool s_inPageChange = FALSE;
+
+ // are you trying to call SetSelection() from a notebook event handler?
+ // you shouldn't!
+ wxCHECK_RET( !s_inPageChange,
+ _T("gtk_notebook_page_change_callback reentered") );
+
+ s_inPageChange = TRUE;
if (g_isIdle)
wxapp_install_idle_handler();
int old = notebook->GetSelection();
- wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
- notebook->GetId(), page, old );
- event1.SetEventObject( notebook );
+ wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+ notebook->GetId(), page, old );
+ eventChanging.SetEventObject( notebook );
- if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
- !event1.IsAllowed() )
+ if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) &&
+ !eventChanging.IsAllowed() )
{
/* program doesn't allow the page change */
- gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), "switch_page" );
- return;
+ gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget),
+ "switch_page" );
+ }
+ else // change allowed
+ {
+ // make wxNotebook::GetSelection() return the correct (i.e. consistent
+ // with wxNotebookEvent::GetSelection()) value even though the page is
+ // not really changed in GTK+
+ notebook->m_selection = page;
+
+ wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+ notebook->GetId(), page, old );
+ eventChanged.SetEventObject( notebook );
+ notebook->GetEventHandler()->ProcessEvent( eventChanged );
}
- wxNotebookEvent event2( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- notebook->GetId(), page, old );
- event2.SetEventObject( notebook );
- notebook->GetEventHandler()->ProcessEvent( event2 );
+ s_inPageChange = FALSE;
}
//-----------------------------------------------------------------------------
here in order to make repositioning after resizing to take effect. */
if ((gtk_major_version == 1) &&
(gtk_minor_version == 2) &&
- (gtk_micro_version < 6) &&
- (win->m_wxwindow) &&
- (GTK_WIDGET_REALIZED(win->m_wxwindow)))
+ (gtk_micro_version < 6) &&
+ (win->m_wxwindow) &&
+ (GTK_WIDGET_REALIZED(win->m_wxwindow)))
{
gtk_widget_size_allocate( win->m_wxwindow, alloc );
}
}
//-----------------------------------------------------------------------------
-// "key_press_event"
+// "key_press_event"
//-----------------------------------------------------------------------------
static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win )
wxNode *node = win->m_pages.Nth( win->GetSelection() );
if (!node) return FALSE;
- wxNotebookPage *page = (wxNotebookPage*) node->Data();
+ wxGtkNotebookPage *page = (wxGtkNotebookPage*) node->Data();
wxNavigationKeyEvent event;
event.SetEventObject( win );
/* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
event.SetDirection( (gdk_event->keyval == GDK_Tab) );
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
+ event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
event.SetCurrentFocus( win );
if (!page->m_client->GetEventHandler()->ProcessEvent( event ))
{
page->m_client->SetFocus();
}
-
+
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
return TRUE;
}
-
+
return FALSE;
}
void wxNotebook::Init()
{
m_imageList = (wxImageList *) NULL;
+ m_ownsImageList = FALSE;
m_pages.DeleteContents( TRUE );
- m_lastSelection = -1;
+ m_selection = -1;
+ m_themeEnabled = TRUE;
}
wxNotebook::wxNotebook()
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
DeleteAllPages();
+ if (m_ownsImageList) delete m_imageList;
}
bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxNoteBook creation failed") );
- return FALSE;
+ return FALSE;
}
m_parent->DoAddChild( this );
- if (m_windowStyle & wxNB_RIGHT)
- gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
- if (m_windowStyle & wxNB_LEFT)
- gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
- if (m_windowStyle & wxNB_BOTTOM)
- gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
+ if (m_windowStyle & wxNB_RIGHT)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT );
+ if (m_windowStyle & wxNB_LEFT)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT );
+ if (m_windowStyle & wxNB_BOTTOM)
+ gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM );
gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event",
GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this );
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- GList *pages = GTK_NOTEBOOK(m_widget)->children;
-
- if (g_list_length(pages) == 0) return -1;
-
- GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-
- if (notebook->cur_page == NULL) return m_lastSelection;
+ if ( m_selection == -1 )
+ {
+ GList *pages = GTK_NOTEBOOK(m_widget)->children;
- return g_list_index( pages, (gpointer)(notebook->cur_page) );
-}
+ if (g_list_length(pages) != 0)
+ {
+ GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
-int wxNotebook::GetPageCount() const
-{
- return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
-}
+ gpointer cur = notebook->cur_page;
+ if ( cur != NULL )
+ {
+ wxConstCast(this, wxNotebook)->m_selection =
+ g_list_index( pages, cur );
+ }
+ }
+ }
-int wxNotebook::GetRowCount() const
-{
- return 1;
+ return m_selection;
}
wxString wxNotebook::GetPageText( int page ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") );
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
return nb_page->m_text;
else
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
return nb_page->m_image;
else
return -1;
}
-wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const
+wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") );
+ wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
- wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
+ wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
wxNode *node = m_pages.Nth( page );
- return (wxNotebookPage *) node->Data();
+ return (wxGtkNotebookPage *) node->Data();
}
int wxNotebook::SetSelection( int page )
int selOld = GetSelection();
+ // cache the selection
+ m_selection = page;
gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
+
+ wxGtkNotebookPage* g_page = GetNotebookPage( page );
+ if (g_page->m_client)
+ g_page->m_client->SetFocus();
return selOld;
}
-void wxNotebook::AdvanceSelection( bool forward )
+void wxNotebook::SetImageList( wxImageList* imageList )
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
-
- int sel = GetSelection();
- int max = GetPageCount();
-
- if (forward)
- SetSelection( sel == max ? 0 : sel + 1 );
- else
- SetSelection( sel == 0 ? max-1 : sel - 1 );
+ if (m_ownsImageList) delete m_imageList;
+ m_imageList = imageList;
+ m_ownsImageList = FALSE;
}
-void wxNotebook::SetImageList( wxImageList* imageList )
+void wxNotebook::AssignImageList( wxImageList* imageList )
{
- m_imageList = imageList;
+ SetImageList(imageList);
+ m_ownsImageList = TRUE;
}
bool wxNotebook::SetPageText( int page, const wxString &text )
{
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
{
/* HvdH 28-12-98: now it works, but it's a bit of a kludge */
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
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;
+ {
+ pixmapwid = GTK_WIDGET(child->data);
+ break;
}
- child = child->next;
- }
+ child = child->next;
+ }
/* We should have the pixmap widget now */
wxASSERT(pixmapwid != NULL);
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;
bool wxNotebook::DeletePage( int page )
{
- wxNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page) return FALSE;
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
+ wxCHECK_MSG( nb_page, FALSE, _T("invalid page in wxNotebook::DeletePage") );
- /* GTK sets GtkNotebook.cur_page to NULL before sending
- the switvh page event */
- m_lastSelection = GetSelection();
+ // 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 )
+ {
+ m_selection = GetSelection();
+ if ( m_selection == (int)m_pages.GetCount() - 1 )
+ {
+ // the index will become invalid after the page is deleted
+ m_selection = -1;
+ }
+ }
nb_page->m_client->Destroy();
m_pages.DeleteObject( nb_page );
- m_lastSelection = -1;
-
return TRUE;
}
-bool wxNotebook::RemovePage( int page )
+wxNotebookPage *wxNotebook::DoRemovePage( int page )
{
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxGtkNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page) return FALSE;
+ wxCHECK_MSG( nb_page, NULL, _T("wxNotebook::RemovePage: invalid page") );
+ gtk_widget_ref( nb_page->m_client->m_widget );
+ gtk_widget_unrealize( nb_page->m_client->m_widget );
+ gtk_widget_unparent( nb_page->m_client->m_widget );
+
gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
+ wxNotebookPage *pageRemoved = (wxNotebookPage *)m_pages[page];
m_pages.DeleteObject( nb_page );
- return TRUE;
+ return pageRemoved;
}
-bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
+bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text,
bool select, int imageId )
{
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
+ if (m_themeEnabled)
+ win->SetThemeEnabled(TRUE);
+
GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
- wxNotebookPage *page = new wxNotebookPage();
+ wxGtkNotebookPage *page = new wxGtkNotebookPage();
if (position < 0)
m_pages.Append( page );
{
if (position < 0)
SetSelection( GetPageCount()-1 );
- else
+ else
SetSelection( position );
}
return TRUE;
}
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text,
bool select, int imageId)
{
return InsertPage( -1, win, text, select, imageId );
event.Skip();
}
-wxWindow *wxNotebook::GetPage( int page ) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("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) )
return TRUE;
}
+#endif
+
void wxNotebook::ApplyWidgetStyle()
{
// TODO, font for labels etc
-
+
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
}
projects / wxWidgets.git / blobdiff