X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..7db33cc31068fcbc0444a3b93829833662fb977a:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 9d70d97f45..248e2e2e05 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -7,10 +7,13 @@ // 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 @@ -20,6 +23,7 @@ #include "wx/imaglist.h" #include "wx/intl.h" #include "wx/log.h" +#include "wx/bitmap.h" #include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" @@ -46,16 +50,6 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -//----------------------------------------------------------------------------- -// debug -//----------------------------------------------------------------------------- - -#ifdef __WXDEBUG__ - -extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window ); - -#endif - //----------------------------------------------------------------------------- // wxGtkNotebookPage //----------------------------------------------------------------------------- @@ -96,14 +90,12 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), 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, + wxCHECK_RET( !notebook->m_inSwitchPage, _T("gtk_notebook_page_change_callback reentered") ); - s_inPageChange = TRUE; + notebook->m_inSwitchPage = TRUE; if (g_isIdle) wxapp_install_idle_handler(); @@ -133,7 +125,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), notebook->GetEventHandler()->ProcessEvent( eventChanged ); } - s_inPageChange = FALSE; + notebook->m_inSwitchPage = FALSE; } //----------------------------------------------------------------------------- @@ -200,8 +192,10 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { int sel = win->GetSelection(); - wxGtkNotebookPage *page = win->GetNotebookPage(sel); - wxCHECK_MSG( page, FALSE, _T("invalid selection in wxNotebook") ); + if (sel == -1) + return TRUE; + wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel); + wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; event.SetEventObject( win ); @@ -245,8 +239,10 @@ END_EVENT_TABLE() void wxNotebook::Init() { + m_padding = 0; + m_inSwitchPage = FALSE; + m_imageList = (wxImageList *) NULL; - m_pagesData.DeleteContents( TRUE ); m_selection = -1; m_themeEnabled = TRUE; } @@ -291,10 +287,6 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_notebook_new(); -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name ); -#endif - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", @@ -330,9 +322,9 @@ int wxNotebook::GetSelection() const if ( m_selection == -1 ) { - GList *pages = GTK_NOTEBOOK(m_widget)->children; + GList *nb_pages = GTK_NOTEBOOK(m_widget)->children; - if (g_list_length(pages) != 0) + if (g_list_length(nb_pages) != 0) { GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); @@ -340,7 +332,7 @@ int wxNotebook::GetSelection() const if ( cur != NULL ) { wxConstCast(this, wxNotebook)->m_selection = - g_list_index( pages, cur ); + g_list_index( nb_pages, cur ); } } } @@ -348,7 +340,7 @@ int wxNotebook::GetSelection() const 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") ); @@ -359,7 +351,7 @@ wxString wxNotebook::GetPageText( int page ) const return wxT(""); } -int wxNotebook::GetPageImage( int page ) const +int wxNotebook::GetPageImage( size_t page ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); @@ -379,11 +371,11 @@ wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const 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(); @@ -398,7 +390,7 @@ int wxNotebook::SetSelection( int page ) 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") ); @@ -408,12 +400,12 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) nb_page->m_text = text; - gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() ); + gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) ); 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 */ @@ -484,7 +476,7 @@ bool wxNotebook::SetPageImage( int page, int image ) 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_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } else @@ -503,9 +495,31 @@ void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } -void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) +void wxNotebook::SetPadding( const wxSize &padding ) { - wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); + + m_padding = padding.GetWidth(); + + int i; + for (i=0; im_image != -1) + { + // gtk_box_set_child_packing sets padding on BOTH sides + // icon provides left padding, label provides center and right + int image = nb_page->m_image; + SetPageImage(i,-1); + SetPageImage(i,image); + } + wxASSERT(nb_page->m_label); + gtk_box_set_child_packing(GTK_BOX(nb_page->m_box), + GTK_WIDGET(nb_page->m_label), + FALSE, FALSE, m_padding, GTK_PACK_END); + } } void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) @@ -525,7 +539,7 @@ bool wxNotebook::DeleteAllPages() 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 @@ -543,7 +557,7 @@ bool wxNotebook::DeletePage( int page ) return wxNotebookBase::DeletePage(page); } -wxNotebookPage *wxNotebook::DoRemovePage( int page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); if ( !client ) @@ -555,12 +569,14 @@ wxNotebookPage *wxNotebook::DoRemovePage( int page ) gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); - m_pagesData.DeleteObject(GetNotebookPage(page)); + 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, @@ -571,7 +587,7 @@ bool wxNotebook::InsertPage( int position, 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 */ @@ -583,30 +599,33 @@ bool wxNotebook::InsertPage( int position, GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxGtkNotebookPage *page = new wxGtkNotebookPage(); + wxGtkNotebookPage *nb_page = new wxGtkNotebookPage(); if ( position == GetPageCount() ) - m_pagesData.Append( page ); + m_pagesData.Append( nb_page ); else - m_pagesData.Insert( m_pagesData.Item( position ), page ); + m_pagesData.Insert( m_pagesData.Item( position ), nb_page ); m_pages.Insert(win, position); - page->m_box = gtk_hbox_new( FALSE, 0 ); - gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 ); + nb_page->m_box = gtk_hbox_new( FALSE, 1 ); + gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); - if (position < 0) - gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); +#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, page->m_box, position ); +#endif + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); - page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; + nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; /* set the label image */ - page->m_image = imageId; + nb_page->m_image = imageId; if (imageId != -1) { @@ -622,27 +641,29 @@ bool wxNotebook::InsertPage( int position, GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_widget_show(pixmapwid); } /* 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 ); - + 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()) ); + 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(page->m_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",