X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..051b55ad8ba1efe5f7c16c430131d4cd1b5fb90e:/src/gtk/notebook.cpp?ds=sidebyside diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 7eee0d5246..2eb7a24f51 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -23,12 +23,29 @@ #include "wx/gtk/win_gtk.h" #include "gdk/gdkkeysyms.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; +//----------------------------------------------------------------------------- +// debug +//----------------------------------------------------------------------------- + +#ifdef __WXDEBUG__ + +extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); + +#endif + //----------------------------------------------------------------------------- // wxNotebookPage //----------------------------------------------------------------------------- @@ -51,8 +68,8 @@ public: /* mark page as "added' to the notebook, return FALSE if the page was already added - */ - + */ + bool Add() { if ( WasAdded() ) @@ -86,6 +103,8 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), gint nPage, gpointer data) { + if (g_isIdle) wxapp_install_idle_handler(); + wxNotebook *notebook = (wxNotebook *)data; int old = notebook->GetSelection(); @@ -104,6 +123,8 @@ 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) wxapp_install_idle_handler(); + if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && (win->m_width == alloc->width) && @@ -111,9 +132,9 @@ 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(); } @@ -121,30 +142,36 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* // "key_press_event" //----------------------------------------------------------------------------- -static gint +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; 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; } @@ -173,7 +200,7 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - wxASSERT_MSG( page->m_page, "Notebook page creation error" ); + wxASSERT_MSG( page->m_page, _T("Notebook page creation error") ); parent->m_pages.Append( page ); } @@ -184,6 +211,10 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) +BEGIN_EVENT_TABLE(wxNotebook, wxControl) + EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) +END_EVENT_TABLE() + void wxNotebook::Init() { m_imageList = (wxImageList *) NULL; @@ -226,7 +257,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_notebook_new(); #ifdef __WXDEBUG__ - debug_focus_in( m_widget, "wxNotebook::m_widget", name ); + debug_focus_in( m_widget, _T("wxNotebook::m_widget"), name ); #endif gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); @@ -252,7 +283,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); if (m_pages.Number() == 0) return -1; @@ -277,7 +308,7 @@ int wxNotebook::GetSelection() const node = node->Next(); } - wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" ); + wxCHECK_MSG( node != NULL, -1, _T("wxNotebook: no selection?") ); return page->m_id; } @@ -287,12 +318,12 @@ int wxNotebook::GetPageCount() 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++; } @@ -306,7 +337,7 @@ int wxNotebook::GetRowCount() const wxString wxNotebook::GetPageText( int page ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) @@ -317,7 +348,7 @@ wxString wxNotebook::GetPageText( int page ) const int wxNotebook::GetPageImage( int page ) const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, 0, _T("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) @@ -328,7 +359,7 @@ int wxNotebook::GetPageImage( int page ) const wxNotebookPage* wxNotebook::GetNotebookPage(int page) const { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, _T("invalid notebook") ); wxNotebookPage *nb_page = (wxNotebookPage *) NULL; @@ -341,14 +372,14 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const node = node->Next(); } - wxFAIL_MSG( "Notebook page not found!" ); + wxFAIL_MSG( _T("Notebook page not found!") ); return (wxNotebookPage *) NULL; } int wxNotebook::SetSelection( int page ) { - wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); int selOld = GetSelection(); wxNotebookPage* nb_page = GetNotebookPage(page); @@ -373,7 +404,7 @@ int wxNotebook::SetSelection( int page ) void wxNotebook::AdvanceSelection( bool bForward ) { - wxCHECK_RET( m_widget != NULL, "invalid notebook" ); + wxCHECK_RET( m_widget != NULL, _T("invalid notebook") ); int sel = GetSelection(); int max = GetPageCount(); @@ -381,7 +412,7 @@ void wxNotebook::AdvanceSelection( bool bForward ) if (bForward) SetSelection( sel == max ? 0 : sel + 1 ); else - SetSelection( sel == 0 ? max : sel - 1 ); + SetSelection( sel == 0 ? max-1 : sel - 1 ); } void wxNotebook::SetImageList( wxImageList* imageList ) @@ -391,17 +422,15 @@ void wxNotebook::SetImageList( wxImageList* imageList ) bool wxNotebook::SetPageText( int page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") ); nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = ""; - - gtk_label_set(nb_page->m_label, nb_page->m_text); + gtk_label_set(nb_page->m_label, nb_page->m_text.mbc_str()); return TRUE; } @@ -409,47 +438,47 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) 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); if (!nb_page) return FALSE; - + /* Optimization posibility: return immediately if image unchanged. * Not enabled because it may break existing (stupid) code that * manipulates the imagelist to cycle images */ - + /* if (image == nb_page->m_image) return TRUE; */ - - /* For different cases: + + /* For different cases: 1) no image -> no image 2) image -> no image 3) no image -> image 4) image -> image */ - + if (image == -1 && nb_page->m_image == -1) return TRUE; /* Case 1): Nothing to do. */ - + GtkWidget *pixmapwid = (GtkWidget*) NULL; - - if (nb_page->m_image != -1) + + 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)) + if (GTK_IS_PIXMAP(child->data)) { pixmapwid = GTK_WIDGET(child->data); break; } child = child->next; } - + /* We should have the pixmap widget now */ - wxASSERT(pixmapwid != NULL); - - if (image == -1) + 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); @@ -458,34 +487,34 @@ bool wxNotebook::SetPageImage( int page, int image ) return TRUE; /* Case 2) */ } } - + /* Only cases 3) and 4) left */ wxASSERT( m_imageList != NULL ); /* Just in case */ - + /* Construct the new pixmap */ const wxBitmap *bmp = m_imageList->GetBitmap(image); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; - if ( bmp->GetMask() ) + if ( bmp->GetMask() ) { mask = bmp->GetMask()->GetBitmap(); } - - if (pixmapwid == NULL) + + if (pixmapwid == NULL) { /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */ pixmapwid = gtk_pixmap_new (pixmap, mask ); - + /* 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 + else { /* Case 4) Simply replace the pixmap */ gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); } - + nb_page->m_image = image; return TRUE; @@ -493,17 +522,22 @@ bool wxNotebook::SetPageImage( int page, int image ) void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" ); + wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") ); } void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) { - wxFAIL_MSG( "wxNotebook::SetPadding not implemented" ); + 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, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); wxNode *page_node = m_pages.First(); while (page_node) @@ -532,12 +566,24 @@ bool wxNotebook::DeletePage( int page ) child = child->next; } - wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" ); + wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); delete nb_page->m_client; m_pages.DeleteObject( nb_page ); + /* adjust the notebook page numbers so that + m_id reflects the current position, Daniel Paull */ + int count = 0; + wxNode *node = m_pages.First(); + wxNotebookPage *pagePtr = (wxNotebookPage *) NULL; + while (node) + { + pagePtr = (wxNotebookPage*)node->Data(); + pagePtr->m_id = count++; + node = node->Next(); + } + return TRUE; } @@ -555,7 +601,7 @@ bool wxNotebook::RemovePage( int page ) child = child->next; } - wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" ); + wxCHECK_MSG( child != NULL, FALSE, _T("illegal notebook index") ); gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); @@ -567,7 +613,7 @@ bool wxNotebook::RemovePage( int page ) bool wxNotebook::AddPage(wxWindow* win, const wxString& text, bool select, int imageId) { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); /* we've created the notebook page in AddChild(). Now we just have to set the caption for the page and set the others parameters. */ @@ -583,10 +629,10 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, } wxCHECK_MSG( page != NULL, FALSE, - "Can't add a page whose parent is not the notebook!" ); + _T("Can't add a page whose parent is not the notebook!") ); wxCHECK_MSG( page->Add(), FALSE, - "Can't add the same page twice to a notebook." ); + _T("Can't add the same page twice to a notebook.") ); if (imageId != -1) { @@ -609,9 +655,9 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, /* then set the attributes */ page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = ""; + if (page->m_text.IsEmpty()) page->m_text = _T(""); page->m_image = imageId; - page->m_label = (GtkLabel *)gtk_label_new(page->m_text); + 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? @@ -624,9 +670,17 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, return TRUE; } +void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) +{ + if (event.IsWindowChange()) + AdvanceSelection( event.GetDirection() ); + else + event.Skip(); +} + wxWindow *wxNotebook::GetPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" ); + wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page)