X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ff27d50429a2911ac98764eef9593be820c32c..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index c65f67eb77..80d7b18caf 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -74,8 +74,6 @@ public: m_box = (GtkWidget *) NULL; } - bool SetFont(const wxFont& font); - wxString m_text; int m_image; GtkNotebookPage *m_page; @@ -84,26 +82,6 @@ public: }; -bool wxGtkNotebookPage::SetFont(const wxFont& font) -{ - if (!m_label) - return false; - -#ifdef __WXGTK20__ - gtk_widget_modify_font(GTK_WIDGET(m_label), - font.GetNativeFontInfo()->description); -#else - GtkRcStyle *style = gtk_rc_style_new(); - style->fontset_name = - g_strdup(font.GetNativeFontInfo()->GetXFontName().c_str()); - gtk_widget_modify_style(GTK_WIDGET(m_label), style); - gtk_rc_style_unref(style); -#endif - - return true; -} - - #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxGtkNotebookPagesList); @@ -112,6 +90,7 @@ WX_DEFINE_LIST(wxGtkNotebookPagesList); // "switch_page" //----------------------------------------------------------------------------- +extern "C" { static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), GtkNotebookPage *WXUNUSED(page), gint page, @@ -154,11 +133,13 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), notebook->m_inSwitchPage = FALSE; } +} //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { if (g_isIdle) @@ -185,11 +166,13 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* gtk_widget_size_allocate( win->m_wxwindow, alloc ); } } +} //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- +extern "C" { static gint gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { @@ -202,37 +185,67 @@ gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) return FALSE; } +} //----------------------------------------------------------------------------- // "key_press_event" //----------------------------------------------------------------------------- -static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *win ) +extern "C" { +static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return FALSE; + if (!notebook->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + + /* win is a control: tab can be propagated up */ + if ((gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right)) + { + int page; + int nMax = notebook->GetPageCount(); + if ( nMax-- ) // decrement it to get the last valid index + { + int nSel = notebook->GetSelection(); + + // change selection wrapping if it becomes invalid + page = (gdk_event->keyval != GDK_Left) ? nSel == nMax ? 0 + : nSel + 1 + : nSel == 0 ? nMax + : nSel - 1; + } + else // notebook is empty, no next page + { + return FALSE; + } + + // m_selection = page; + gtk_notebook_set_page( GTK_NOTEBOOK(widget), page ); + + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; + } /* win is a control: tab can be propagated up */ if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) { - int sel = win->GetSelection(); + int sel = notebook->GetSelection(); if (sel == -1) return TRUE; - wxGtkNotebookPage *nb_page = win->GetNotebookPage(sel); + wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel); wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") ); wxNavigationKeyEvent event; - event.SetEventObject( win ); + event.SetEventObject( notebook ); /* 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 ); + event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) || + (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Right) ); + event.SetCurrentFocus( notebook ); - wxNotebookPage *client = win->GetPage(sel); + wxNotebookPage *client = notebook->GetPage(sel); if ( !client->GetEventHandler()->ProcessEvent( event ) ) { client->SetFocus(); @@ -244,6 +257,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk return FALSE; } +} //----------------------------------------------------------------------------- // InsertChild callback for wxNotebook @@ -251,12 +265,19 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) { - // Hack alert! We manually set the child window - // parent field so that GTK can query the - // notebook's style and font. Without that, GetBestSize could return - // incorrect size, see bug #901694 for details + // 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) - child->m_widget->parent = parent->m_widget; + gtk_widget_set_parent(child->m_widget, parent->m_widget); + + // 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. } //----------------------------------------------------------------------------- @@ -486,7 +507,7 @@ bool wxNotebook::SetPageImage( size_t page, int image ) wxASSERT( m_imageList != NULL ); /* Just in case */ /* Construct the new pixmap */ - const wxBitmap *bmp = m_imageList->GetBitmap(image); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(image); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -560,23 +581,18 @@ bool wxNotebook::DeleteAllPages() wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } -bool wxNotebook::DeletePage( size_t page ) +wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) { - if ( m_selection == (int)m_pagesData.GetCount() - 1 ) + if ( m_selection != -1 && (size_t)m_selection >= page ) { // the index will become invalid after the page is deleted m_selection = -1; } - // it will call our DoRemovePage() to do the real work - return wxNotebookBase::DeletePage(page); -} - -wxNotebookPage *wxNotebook::DoRemovePage( size_t page ) -{ wxNotebookPage *client = wxNotebookBase::DoRemovePage(page); if ( !client ) return NULL; @@ -617,8 +633,11 @@ bool wxNotebook::InsertPage( size_t position, wxCHECK_MSG( position <= GetPageCount(), FALSE, _T("invalid page index in wxNotebookPage::InsertPage()") ); - // Hack alert part II! See above in InsertChildInNotebook - // callback why this has to be done. + // Hack Alert! (Part II): See above in wxInsertChildInNotebook callback + // why this has to be done. NOTE: using gtk_widget_unparent here does not + // work as it seems to undo too much and will cause errors in the + // gtk_notebook_insert_page below, so instead just clear the parent by + // hand here. win->m_widget->parent = NULL; // don't receive switch page during addition @@ -662,7 +681,7 @@ bool wxNotebook::InsertPage( size_t position, { wxASSERT( m_imageList != NULL ); - const wxBitmap *bmp = m_imageList->GetBitmap(imageId); + const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; if ( bmp->GetMask() ) @@ -685,6 +704,14 @@ bool wxNotebook::InsertPage( size_t position, nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); + /* apply current style */ + GtkRcStyle *style = CreateWidgetStyle(); + if ( style ) + { + gtk_widget_modify_style(GTK_WIDGET(nb_page->m_label), style); + gtk_rc_style_unref(style); + } + /* show the label */ gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); if (select && (m_pagesData.GetCount() > 1)) @@ -701,6 +728,7 @@ bool wxNotebook::InsertPage( size_t position, gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this ); + InvalidateBestSize(); return TRUE; } @@ -805,8 +833,10 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) { - // TODO, font for labels etc - gtk_widget_modify_style( m_widget, style ); + gtk_widget_modify_style(m_widget, style); + size_t cnt = m_pagesData.GetCount(); + for (size_t i = 0; i < cnt; i++) + gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style); } bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) @@ -815,19 +845,6 @@ bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) (NOTEBOOK_PANEL(m_widget) == window)); } -bool wxNotebook::SetFont(const wxFont& font) -{ - bool rc=wxNotebookBase::SetFont(font); - - if (rc) - { - size_t i; - for (i=0 ; i < m_pagesData.GetCount() ; i++) - GetNotebookPage(i)->SetFont(font); - } - return rc; -} - // static wxVisualAttributes wxNotebook::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))