X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73e68c1d43ababd68363c60cfb1b9f7ffbc016bc..31ad423e4fb556ec225a63b161154d3bf3445c1b:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 76baec9d8e..1e73e040c1 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -24,12 +24,15 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/bitmap.h" +#include "wx/fontutil.h" #include "wx/gtk/private.h" #include "wx/gtk/win_gtk.h" #include +#include "wx/msgdlg.h" + // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- @@ -64,23 +67,47 @@ extern bool g_blockEventsOnDrag; class wxGtkNotebookPage: public wxObject { public: - wxGtkNotebookPage() - { - m_image = -1; - m_page = (GtkNotebookPage *) NULL; - m_box = (GtkWidget *) NULL; - } - - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - GtkWidget *m_box; // in which the label and image are packed + wxGtkNotebookPage() + { + m_image = -1; + m_page = (GtkNotebookPage *) NULL; + m_box = (GtkWidget *) NULL; + } + + bool SetFont(const wxFont& font); + + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + GtkWidget *m_box; // in which the label and image are packed }; + +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); + //----------------------------------------------------------------------------- // "switch_page" //----------------------------------------------------------------------------- @@ -222,9 +249,14 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk // InsertChild callback for wxNotebook //----------------------------------------------------------------------------- -static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) ) +static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child ) { - /* we don't do anything here but pray */ + // 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 + // (http://sourceforge.net/tracker/?func=detail&aid=901694&group_id=9863&atid=109863) + child->m_widget->parent = parent->m_widget; } //----------------------------------------------------------------------------- @@ -300,15 +332,11 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); - PostCreation(); - - SetFont( parent->GetFont() ); + PostCreation(size); gtk_signal_connect( GTK_OBJECT(m_widget), "realize", GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); - Show( TRUE ); - return TRUE; } @@ -532,6 +560,7 @@ bool wxNotebook::DeleteAllPages() wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") ); + InvalidateBestSize(); return wxNotebookBase::DeleteAllPages(); } @@ -589,7 +618,11 @@ bool wxNotebook::InsertPage( size_t position, wxCHECK_MSG( position <= GetPageCount(), FALSE, _T("invalid page index in wxNotebookPage::InsertPage()") ); - /* don't receive switch page during addition */ + // Hack alert part II! See above in InsertChildInNotebook + // callback why this has to be done. + win->m_widget->parent = NULL; + + // 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 ); @@ -646,12 +679,13 @@ bool wxNotebook::InsertPage( size_t position, } /* set the label text */ + 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(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 ); - + /* show the label */ gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); if (select && (m_pagesData.GetCount() > 1)) @@ -668,9 +702,85 @@ 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; } +// helper for HitTest(): check if the point lies inside the given widget which +// is the child of the notebook whose position and border size are passed as +// parameters +static bool +IsPointInsideWidget(const wxPoint& pt, GtkWidget *w, + gint x, gint y, gint border = 0) +{ + return + (pt.x >= w->allocation.x - x - border) && + (pt.x <= w->allocation.x - x + border + w->allocation.width) && + (pt.y >= w->allocation.y - y - border) && + (pt.y <= w->allocation.y - y + border + w->allocation.height); +} + +int wxNotebook::HitTest(const wxPoint& pt, long *flags) const +{ + const gint x = m_widget->allocation.x; + const gint y = m_widget->allocation.y; + + const size_t count = GetPageCount(); + for ( size_t i = 0; i < count; i++ ) + { + wxGtkNotebookPage* nb_page = GetNotebookPage(i); + GtkWidget *box = nb_page->m_box; + + // VZ: don't know how to find the border width in GTK+ 1.2 +#ifdef __WXGTK20__ + const gint border = gtk_container_get_border_width(GTK_CONTAINER(box)); +#else // !GTK+ 2.x + const gint border = 0; +#endif + if ( IsPointInsideWidget(pt, box, x, y, border) ) + { + // ok, we're inside this tab -- now find out where, if needed + if ( flags ) + { + GtkWidget *pixmap = NULL; + + GList *children = gtk_container_children(GTK_CONTAINER(box)); + for ( GList *child = children; child; child = child->next ) + { + if ( GTK_IS_PIXMAP(child->data) ) + { + pixmap = GTK_WIDGET(child->data); + break; + } + } + + if ( children ) + g_list_free(children); + + if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) + { + *flags = wxNB_HITTEST_ONICON; + } + else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) + { + *flags = wxNB_HITTEST_ONLABEL; + } + else + { + *flags = wxNB_HITTEST_ONITEM; + } + } + + return i; + } + } + + if ( flags ) + *flags = wxNB_HITTEST_NOWHERE; + + return wxNOT_FOUND; +} + void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { if (event.IsWindowChange()) @@ -695,12 +805,10 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) #endif -void wxNotebook::ApplyWidgetStyle() +void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) { // TODO, font for labels etc - - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_widget_modify_style( m_widget, style ); } bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) @@ -709,6 +817,26 @@ 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)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_notebook_new); +} + //----------------------------------------------------------------------------- // wxNotebookEvent //-----------------------------------------------------------------------------