X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1af991f497a5e95d8f8ab15a4e4a4a4c375928f..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk1/notebook.cpp?ds=sidebyside diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 6102168a49..5d9d65d088 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -82,7 +82,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), gint page, wxNotebook *notebook ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); int old = notebook->GetSelection(); @@ -90,7 +90,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, notebook->GetId(), page, old ); event1.SetEventObject( notebook ); - + if ((notebook->GetEventHandler()->ProcessEvent( event1 )) && !event1.IsAllowed() ) { @@ -111,9 +111,9 @@ 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) + if (g_isIdle) wxapp_install_idle_handler(); - + if ((win->m_x == alloc->x) && (win->m_y == alloc->y) && (win->m_width == alloc->width) && @@ -121,47 +121,36 @@ 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(); + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call allocate + here in order to make repositioning after resizing to take effect. */ + if ((gtk_major_version == 1) && + (gtk_minor_version == 2) && + (gtk_micro_version < 6) && + (win->m_wxwindow) && + (GTK_WIDGET_REALIZED(win->m_wxwindow))) + { + gtk_widget_size_allocate( win->m_wxwindow, alloc ); + } } //----------------------------------------------------------------------------- -// "key_press_event" +// "realize" from m_widget //----------------------------------------------------------------------------- static gint -gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook ) +gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win ) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) return FALSE; - - if (!notebook->m_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" ); + if (g_isIdle) + wxapp_install_idle_handler(); - page->m_client->SetFocus(); + /* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize + here in order to make repositioning before showing to take effect. */ + gtk_widget_queue_resize( win->m_widget ); - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -206,7 +195,7 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, wxNotebook::~wxNotebook() { /* don't generate change page events any more */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this ); DeleteAllPages(); @@ -220,12 +209,18 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_acceptsFocus = TRUE; m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxNoteBook creation failed") ); + return FALSE; + } + m_widget = gtk_notebook_new(); #ifdef __WXDEBUG__ - debug_focus_in( m_widget, _T("wxNotebook::m_widget"), name ); + debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name ); #endif gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); @@ -235,28 +230,48 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); - gtk_signal_connect( GTK_OBJECT(m_widget), "key_press_event", - GTK_SIGNAL_FUNC(gtk_notebook_key_press_callback), (gpointer)this ); + if(m_windowStyle & wxNB_RIGHT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_RIGHT ); + if(m_windowStyle & wxNB_LEFT) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_LEFT ); + if(m_windowStyle & wxNB_BOTTOM) + gtk_notebook_set_tab_pos( GTK_NOTEBOOK(m_widget), GTK_POS_BOTTOM ); PostCreation(); + gtk_signal_connect( GTK_OBJECT(m_widget), "realize", + GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this ); + Show( TRUE ); return TRUE; } +void wxNotebook::SetFocus() +{ + if (m_pages.GetCount() == 0) return; + + wxNode *node = m_pages.Nth( GetSelection() ); + + if (!node) return; + + wxNotebookPage *page = (wxNotebookPage*) node->Data(); + + page->m_client->SetFocus(); +} + int wxNotebook::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); GList *pages = GTK_NOTEBOOK(m_widget)->children; if (g_list_length(pages) == 0) return -1; GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - + if (notebook->cur_page == NULL) return m_lastSelection; - + return g_list_index( pages, (gpointer)(notebook->cur_page) ); } @@ -272,18 +287,18 @@ int wxNotebook::GetRowCount() const wxString wxNotebook::GetPageText( int page ) const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else - return ""; + return wxT(""); } int wxNotebook::GetPageImage( int page ) const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) @@ -294,23 +309,23 @@ int wxNotebook::GetPageImage( int page ) const wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") ); + + wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, _T("invalid notebook index") ); - wxNode *node = m_pages.Nth( page ); - + return (wxNotebookPage *) node->Data(); } int wxNotebook::SetSelection( int page ) { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, _T("invalid notebook index") ); + wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") ); int selOld = GetSelection(); - + gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page ); return selOld; @@ -318,7 +333,7 @@ int wxNotebook::SetSelection( int page ) void wxNotebook::AdvanceSelection( bool forward ) { - wxCHECK_RET( m_widget != NULL, _T("invalid notebook") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") ); int sel = GetSelection(); int max = GetPageCount(); @@ -336,16 +351,16 @@ void wxNotebook::SetImageList( wxImageList* imageList ) bool wxNotebook::SetPageText( int page, const wxString &text ) { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); - wxCHECK_MSG( nb_page, FALSE, _T("SetPageText: invalid page index") ); + wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); nb_page->m_text = text; gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() ); - + return TRUE; } @@ -436,22 +451,22 @@ bool wxNotebook::SetPageImage( int page, int image ) void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxFAIL_MSG( _T("wxNotebook::SetPageSize not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") ); } void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) { - wxFAIL_MSG( _T("wxNotebook::SetPadding not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") ); } void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { - wxFAIL_MSG( _T("wxNotebook::SetTabSize not implemented") ); + wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") ); } bool wxNotebook::DeleteAllPages() { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); while (m_pages.GetCount() > 0) DeletePage( m_pages.GetCount()-1 ); @@ -467,10 +482,10 @@ bool wxNotebook::DeletePage( int page ) /* GTK sets GtkNotebook.cur_page to NULL before sending the switvh page event */ m_lastSelection = GetSelection(); - + nb_page->m_client->Destroy(); m_pages.DeleteObject( nb_page ); - + m_lastSelection = -1; return TRUE; @@ -479,7 +494,7 @@ bool wxNotebook::DeletePage( int page ) bool wxNotebook::RemovePage( int page ) { wxNotebookPage* nb_page = GetNotebookPage(page); - + if (!nb_page) return FALSE; gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page ); @@ -492,24 +507,24 @@ bool wxNotebook::RemovePage( int page ) bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, bool select, int imageId ) { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); wxCHECK_MSG( win->GetParent() == this, FALSE, - _T("Can't add a page whose parent is not the notebook!") ); + wxT("Can't add a page whose parent is not the notebook!") ); - /* don't receive switch page during addition */ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + /* 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 ); - + GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); wxNotebookPage *page = new wxNotebookPage(); - + if (position < 0) m_pages.Append( page ); else m_pages.Insert( m_pages.Nth( position ), page ); - + page->m_client = win; page->m_box = gtk_hbox_new( FALSE, 0 ); @@ -520,14 +535,14 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, if (position < 0) gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); - else + else gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position ); page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; /* set the label image */ page->m_image = imageId; - + if (imageId != -1) { wxASSERT( m_imageList != NULL ); @@ -549,8 +564,8 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, /* set the label text */ page->m_text = text; - if (page->m_text.IsEmpty()) page->m_text = _T(""); - + 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 ); @@ -587,7 +602,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) wxWindow *wxNotebook::GetPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, _T("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") ); wxNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) @@ -626,4 +641,4 @@ bool wxNotebook::IsOwnGtkWindow( GdkWindow *window ) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) -#endif \ No newline at end of file +#endif