X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e609c82594a57104ff5e0d4044b2e2697a4b576..c764029c20f8edf64dcbe9fc3649773c3063227a:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 34dd2bf59d..f95f03dce6 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -19,10 +19,11 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/panel.h" + #include "wx/msgdlg.h" + #include "wx/bitmap.h" #endif #include "wx/imaglist.h" -#include "wx/bitmap.h" #include "wx/fontutil.h" // FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width @@ -36,8 +37,6 @@ #include -#include "wx/msgdlg.h" - // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- @@ -193,8 +192,7 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) { - if (g_isIdle) - wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal if (!notebook->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; @@ -222,7 +220,6 @@ gtk_notebook_key_press_callback( GtkWidget *widget, // m_selection = page; gtk_notebook_set_current_page( GTK_NOTEBOOK(widget), page ); - g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -250,7 +247,6 @@ gtk_notebook_key_press_callback( GtkWidget *widget, client->SetFocus(); } - g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; } @@ -325,6 +321,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_acceptsFocus = true; m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + style |= wxBK_TOP; + if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { @@ -776,15 +775,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) ) { - *flags = wxNB_HITTEST_ONICON; + *flags = wxBK_HITTEST_ONICON; } else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) ) { - *flags = wxNB_HITTEST_ONLABEL; + *flags = wxBK_HITTEST_ONLABEL; } else { - *flags = wxNB_HITTEST_ONITEM; + *flags = wxBK_HITTEST_ONITEM; } } @@ -793,7 +792,22 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const } if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + { + *flags = wxBK_HITTEST_NOWHERE; + wxWindowBase * page = GetCurrentPage(); + if ( page ) + { + // rect origin is in notebook's parent coordinates + wxRect rect = page->GetRect(); + + // adjust it to the notebook's coordinates + wxPoint pos = GetPosition(); + rect.x -= pos.x; + rect.y -= pos.y; + if ( rect.Inside( pt ) ) + *flags |= wxBK_HITTEST_ONPAGE; + } + } return wxNOT_FOUND; } @@ -830,10 +844,12 @@ void wxNotebook::DoApplyWidgetStyle(GtkRcStyle *style) gtk_widget_modify_style(GTK_WIDGET(GetNotebookPage(i)->m_label), style); } -bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxNotebook::GTKGetWindow(wxArrayGdkWindows& windows) const { - return ((m_widget->window == window) || - GTK_NOTEBOOK(m_widget)->event_window == window); + windows.push_back(m_widget->window); + windows.push_back(GTK_NOTEBOOK(m_widget)->event_window); + + return NULL; } // static