X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..8775b357008a14fd2acdd2e2c70600f1c6346504:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 7dae078001..4fbff0c3df 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -21,10 +21,10 @@ #include "wx/intl.h" #include "wx/log.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include #include "wx/gtk/win_gtk.h" -#include "gdk/gdkkeysyms.h" +#include //----------------------------------------------------------------------------- // idle system @@ -50,18 +50,18 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar #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; } @@ -69,7 +69,7 @@ public: 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 }; @@ -82,7 +82,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), gint page, wxNotebook *notebook ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); int old = notebook->GetSelection(); @@ -90,7 +90,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, notebook->GetId(), page, old ); event1.SetEventObject( notebook ); - + if ((notebook->GetEventHandler()->ProcessEvent( event1 )) && !event1.IsAllowed() ) { @@ -111,9 +111,9 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); - + if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && (win->m_width == alloc->width) && @@ -121,10 +121,75 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* { return; } - + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); - if (win->GetAutoLayout()) win->Layout(); + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate + 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_widget_size_allocate( win->m_wxwindow, alloc ); + } +} + +//----------------------------------------------------------------------------- +// "realize" from m_widget +//----------------------------------------------------------------------------- + +static gint +gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize + here in order to make repositioning before showing to take effect. */ + gtk_widget_queue_resize( win->m_widget ); + + return FALSE; +} + +//----------------------------------------------------------------------------- +// "key_press_event" +//----------------------------------------------------------------------------- + +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) + { + wxNode *node = win->m_pages.Nth( win->GetSelection() ); + if (!node) return FALSE; + + 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; } //----------------------------------------------------------------------------- @@ -169,7 +234,7 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { /* don't generate change page events any more */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); DeleteAllPages(); @@ -187,7 +252,7 @@ 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; } @@ -204,31 +269,26 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, 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 ); - PostCreation(); - - Show( TRUE ); - - return TRUE; -} + gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", + GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); -void wxNotebook::SetFocus() -{ - if (m_pages.GetCount() == 0) return; + PostCreation(); - wxNode *node = m_pages.Nth( GetSelection() ); + SetFont( parent->GetFont() ); - if (!node) return; + gtk_signal_connect( GTK_OBJECT(m_widget), "realize", + GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); - wxNotebookPage *page = (wxNotebookPage*) node->Data(); + Show( TRUE ); - page->m_client->SetFocus(); + return TRUE; } int wxNotebook::GetSelection() const @@ -240,9 +300,9 @@ int wxNotebook::GetSelection() const if (g_list_length(pages) == 0) return -1; GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - + if (notebook->cur_page == NULL) return m_lastSelection; - + return g_list_index( pages, (gpointer)(notebook->cur_page) ); } @@ -260,7 +320,7 @@ 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 @@ -271,22 +331,22 @@ int wxNotebook::GetPageImage( int page ) const { 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(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") ); - wxNode *node = m_pages.Nth( page ); - - return (wxNotebookPage *) node->Data(); + + return (wxGtkNotebookPage *) node->Data(); } int wxNotebook::SetSelection( int page ) @@ -296,8 +356,12 @@ int wxNotebook::SetSelection( int page ) wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); - + 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; } @@ -306,13 +370,19 @@ void wxNotebook::AdvanceSelection( bool forward ) { wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); - int sel = GetSelection(); int max = GetPageCount(); + if ( !max ) + { + // nothing to do with empty notebook + return; + } + + int sel = GetSelection(); if (forward) - SetSelection( sel == max ? 0 : sel + 1 ); + SetSelection( sel == max - 1 ? 0 : sel + 1 ); else - SetSelection( sel == 0 ? max-1 : sel - 1 ); + SetSelection( sel == 0 ? max - 1 : sel - 1 ); } void wxNotebook::SetImageList( wxImageList* imageList ) @@ -324,14 +394,14 @@ 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") ); nb_page->m_text = text; gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() ); - + return TRUE; } @@ -339,7 +409,7 @@ bool wxNotebook::SetPageImage( int page, int image ) { /* 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; @@ -366,20 +436,20 @@ bool wxNotebook::SetPageImage( int page, int image ) 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; @@ -447,16 +517,16 @@ bool wxNotebook::DeleteAllPages() bool wxNotebook::DeletePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; /* GTK sets GtkNotebook.cur_page to NULL before sending the switvh page event */ m_lastSelection = GetSelection(); - + nb_page->m_client->Destroy(); m_pages.DeleteObject( nb_page ); - + m_lastSelection = -1; return TRUE; @@ -464,8 +534,8 @@ bool wxNotebook::DeletePage( int page ) bool wxNotebook::RemovePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); - + wxGtkNotebookPage* nb_page = GetNotebookPage(page); + if (!nb_page) return FALSE; gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); @@ -475,7 +545,7 @@ bool wxNotebook::RemovePage( int page ) return TRUE; } -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") ); @@ -483,19 +553,19 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, wxCHECK_MSG( win->GetParent() == this, FALSE, wxT("Can't add a page whose parent is not the notebook!") ); - /* don't receive switch page during addition */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + /* 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 ); - + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxNotebookPage *page = new wxNotebookPage(); - + wxGtkNotebookPage *page = new wxGtkNotebookPage(); + if (position < 0) m_pages.Append( page ); else m_pages.Insert( m_pages.Nth( position ), page ); - + page->m_client = win; page->m_box = gtk_hbox_new( FALSE, 0 ); @@ -506,14 +576,14 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, if (position < 0) gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); - else + else gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position ); page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; /* set the label image */ page->m_image = imageId; - + if (imageId != -1) { wxASSERT( m_imageList != NULL ); @@ -536,7 +606,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, /* set the label text */ page->m_text = text; if (page->m_text.IsEmpty()) page->m_text = wxT(""); - + page->m_label = GTK_LABEL( gtk_label_new(page->m_text.mbc_str()) ); gtk_box_pack_end( GTK_BOX(page->m_box), GTK_WIDGET(page->m_label), FALSE, FALSE, 3 ); @@ -547,7 +617,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, { if (position < 0) SetSelection( GetPageCount()-1 ); - else + else SetSelection( position ); } @@ -557,7 +627,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, 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 ); @@ -571,17 +641,19 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.Skip(); } -wxWindow *wxNotebook::GetPage( int page ) const +wxNotebookPage *wxNotebook::GetPage( int page ) const { wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) - return (wxWindow *) NULL; + return (wxNotebookPage *) 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) ) { @@ -594,8 +666,12 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) return TRUE; } +#endif + void wxNotebook::ApplyWidgetStyle() { + // TODO, font for labels etc + SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); }