X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e6322e0e538b98cb68100df788eb14bbf31dcd5..9c039d08bfbb59c0abcbc705fb49f9b2cb321edf:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 1629c14c34..d9b2bbc090 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -5,7 +5,7 @@ // Created: 01/02/97 // Id: // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -25,240 +25,285 @@ class wxNotebookPage: public wxObject { - public: - - int m_id; - wxString m_text; - int m_image; - void *m_clientData; - GtkNotebookPage *m_page; - GtkLabel *m_label; - wxWindow *m_clientPanel; - - wxNotebookPage() - { - m_id = -1; - m_text = ""; - m_image = -1; - m_clientData = NULL; - m_page = NULL; - m_clientPanel = NULL; - }; - +public: + wxNotebookPage() + { + m_id = -1; + m_text = ""; + m_image = -1; + m_page = (GtkNotebookPage *) NULL; + m_client = (wxWindow *) NULL; + m_parent = (GtkNotebook *) NULL; + m_box = (GtkWidget *) NULL; + } + +//private: + int m_id; + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + wxWindow *m_client; + GtkNotebook *m_parent; + GtkWidget *m_box; // in which the label and image are packed }; //----------------------------------------------------------------------------- -// wxNotebook +// "switch_page" +//----------------------------------------------------------------------------- + +static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), + GtkNotebookPage *WXUNUSED(page), + gint nPage, + gpointer data) +{ + wxNotebook *notebook = (wxNotebook *)data; + + int old = notebook->GetSelection(); + + // TODO: emulate PAGE_CHANGING event + + wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, + notebook->GetId(), nPage, old ); + event.SetEventObject( notebook ); + notebook->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "size_allocate" //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxNotebook, wxControl) - EVT_SIZE(wxNotebook::OnSize) -END_EVENT_TABLE() +static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) +{ + if (win->GetAutoLayout()) win->Layout(); + + if ((win->m_x == alloc->x) && + (win->m_y == alloc->y) && + (win->m_width == alloc->width) && + (win->m_height == alloc->height)) + { + return; + } + + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); +} + +//----------------------------------------------------------------------------- +// wxNotebook +//----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) -wxNotebook::wxNotebook(void) +void wxNotebook::Init() { - m_imageList = NULL; + m_imageList = (wxImageList *) NULL; m_pages.DeleteContents( TRUE ); -}; + m_idHandler = 0; +} -wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id, +wxNotebook::wxNotebook() +{ + Init(); +} + +wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - const long style, const wxString& name ) + long style, const wxString& name ) { - m_imageList = NULL; - m_pages.DeleteContents( TRUE ); + Init(); Create( parent, id, pos, size, style, name ); -}; +} -wxNotebook::~wxNotebook(void) +wxNotebook::~wxNotebook() { - if (m_imageList) delete m_imageList; + // don't generate change page events any more + if (m_idHandler != 0) + gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler); + DeleteAllPages(); -}; +} -bool wxNotebook::Create(wxWindow *parent, const wxWindowID id, +bool wxNotebook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - const long style, const wxString& name ) + long style, const wxString& name ) { m_needParent = TRUE; - + PreCreation( parent, id, pos, size, style, name ); m_widget = gtk_notebook_new(); - + + gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); + + m_idHandler = gtk_signal_connect + ( + GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), + (gpointer)this + ); + PostCreation(); - + Show( TRUE ); - + return TRUE; -}; +} -int wxNotebook::GetSelection(void) const +int wxNotebook::GetSelection() const { if (m_pages.Number() == 0) return -1; GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page; - - wxNotebookPage *page = NULL; + + wxNotebookPage *page = (wxNotebookPage *) NULL; wxNode *node = m_pages.First(); while (node) { page = (wxNotebookPage*)node->Data(); - if (page->m_page == g_page) break; + if (page->m_page == g_page) + break; node = node->Next(); - }; - - if (!node) wxFatalError( "Notebook error." ); - - return page->m_id; -}; + } -wxImageList* wxNotebook::GetImageList(void) const -{ - return m_imageList; -}; + wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" ); + + return page->m_id; +} -int wxNotebook::GetPageCount(void) const +int wxNotebook::GetPageCount() const { return m_pages.Number(); -}; +} -int wxNotebook::GetRowCount(void) const +int wxNotebook::GetRowCount() const { return 1; -}; +} -wxString wxNotebook::GetPageText( const int page ) const +wxString wxNotebook::GetPageText( int page ) const { wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else return ""; -}; +} -int wxNotebook::GetPageImage( const int page ) const +int wxNotebook::GetPageImage( int page ) const { wxNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_image; else return 0; -}; - -void* wxNotebook::GetPageData( const int page ) const -{ - wxNotebookPage* nb_page = GetNotebookPage(page); - if (nb_page) - return nb_page->m_clientData; - else - return NULL; -}; +} wxNotebookPage* wxNotebook::GetNotebookPage(int page) const { - wxNotebookPage *nb_page = NULL; + wxNotebookPage *nb_page = (wxNotebookPage *) NULL; wxNode *node = m_pages.First(); while (node) { nb_page = (wxNotebookPage*)node->Data(); - if (nb_page->m_id == page) break; + if (nb_page->m_id == page) + return nb_page; node = node->Next(); - }; - if (!node) return NULL; - return nb_page; -}; + } -int wxNotebook::SetSelection( const int page ) + wxLogDebug( "Notebook page %d not found!", page ); + + return (wxNotebookPage *) NULL; +} + +int wxNotebook::SetSelection( int page ) { + int selOld = GetSelection(); wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return -1; + if (!nb_page) return -1; + int page_num = 0; GList *child = GTK_NOTEBOOK(m_widget)->children; while (child) { - if (nb_page->m_page == (GtkNotebookPage*)child->data) break; + if (nb_page->m_page == (GtkNotebookPage*)child->data) break; page_num++; child = child->next; - }; - + } + if (!child) return -1; - + gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); - - return page; -}; + + return selOld; +} + +void wxNotebook::AdvanceSelection( bool bForward ) +{ + int sel = GetSelection(); + int max = GetPageCount(); + + if (bForward) + SetSelection( sel == max ? 0 : sel + 1 ); + else + SetSelection( sel == 0 ? max : sel - 1 ); +} void wxNotebook::SetImageList( wxImageList* imageList ) { m_imageList = imageList; -}; +} -bool wxNotebook::SetPageText( const int page, const wxString &text ) +bool wxNotebook::SetPageText( int page, const wxString &text ) { wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return FALSE; + if (!nb_page) return FALSE; + nb_page->m_text = text; - - // recreate - - return TRUE; -}; -bool wxNotebook::SetPageImage( const int page, const int image ) -{ - wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) - return FALSE; - - nb_page->m_image = image; - - // recreate - return TRUE; -}; +} -bool wxNotebook::SetPageData( const int page, void* data ) +bool wxNotebook::SetPageImage( int page, int image ) { wxNotebookPage* nb_page = GetNotebookPage(page); + if (!nb_page) return FALSE; - nb_page->m_clientData = data; - + nb_page->m_image = image; + return TRUE; -}; +} void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { -}; + wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" ); +} void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) { - // what's this ? -}; + wxFAIL_MSG( "wxNotebook::SetPadding not implemented" ); +} -bool wxNotebook::DeleteAllPages(void) +bool wxNotebook::DeleteAllPages() { wxNode *page_node = m_pages.First(); while (page_node) { wxNotebookPage *page = (wxNotebookPage*)page_node->Data(); - + DeletePage( page->m_id ); - + page_node = m_pages.First(); - }; - + } + return TRUE; -}; +} -bool wxNotebook::DeletePage( const int page ) +bool wxNotebook::DeletePage( int page ) { wxNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -270,82 +315,101 @@ bool wxNotebook::DeletePage( const int page ) if (nb_page->m_page == (GtkNotebookPage*)child->data) break; page_num++; child = child->next; - }; + } wxASSERT( child ); - - delete nb_page->m_clientPanel; - + + delete nb_page->m_client; + // Amazingly, this is not necessary // gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num ); - + m_pages.DeleteObject( nb_page ); - + return TRUE; -}; +} -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, const int imageId, void* data) +bool wxNotebook::AddPage(wxWindow* win, const wxString& text, + bool bSelect, int imageId) { // we've created the notebook page in AddChild(). Now we just have to set // the caption for the page and set the others parameters. - // first, find the page - wxNotebookPage *page = NULL; + wxNotebookPage *page = (wxNotebookPage *) NULL; wxNode *node = m_pages.First(); while (node) { page = (wxNotebookPage*)node->Data(); - if ( page->m_clientPanel == win ) - break; // found + if ( page->m_client == win ) break; node = node->Next(); - }; - - if ( page == NULL ) { - wxFAIL_MSG("Can't add a page whose parent is not the notebook!"); + } + + wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" ); + + if (imageId != -1) + { + wxASSERT( m_imageList != NULL ); + + wxBitmap *bmp = m_imageList->GetBitmap(imageId); + GdkPixmap *pixmap = bmp->GetPixmap(); + GdkBitmap *mask = (GdkBitmap*) NULL; + if (bmp->GetMask()) mask = bmp->GetMask()->GetBitmap(); + GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); - return FALSE; + gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3); + + gtk_widget_show(pixmapwid); } - + // then set the attributes page->m_text = text; - if ( page->m_text.IsEmpty() ) - page->m_text = ""; + if (page->m_text.IsEmpty()) page->m_text = ""; page->m_image = imageId; - page->m_clientData = data; - gtk_label_set(page->m_label, page->m_text); + page->m_label = (GtkLabel *)gtk_label_new(page->m_text); + gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3); + + // @@@: what does this do? do we still need it? + // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); + + gtk_widget_show((GtkWidget *)page->m_label); + + if (bSelect) SetSelection(GetPageCount()); return TRUE; -}; +} -wxWindow *wxNotebook::GetPageWindow( const int page ) const +wxWindow *wxNotebook::GetPage( int page ) const { wxNotebookPage* nb_page = GetNotebookPage(page); - if (!nb_page) return NULL; - - return nb_page->m_clientPanel; -}; + if (!nb_page) + return (wxWindow *) NULL; + else + return nb_page->m_client; +} void wxNotebook::AddChild( wxWindow *win ) { - // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook - // case is speicla there (Robert?) m_children.Append(win); wxNotebookPage *page = new wxNotebookPage(); page->m_id = GetPageCount(); - page->m_label = (GtkLabel *)gtk_label_new("no caption"); - page->m_clientPanel = win; - gtk_notebook_append_page(GTK_NOTEBOOK(m_widget), win->m_widget, - (GtkWidget *)page->m_label); - gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); - - page->m_page = (GtkNotebookPage*) - ( - g_list_last(GTK_NOTEBOOK(m_widget)->children)->data - ); - + + page->m_box = gtk_hbox_new (FALSE, 0); + gtk_container_border_width(GTK_CONTAINER(page->m_box), 2); + + page->m_client = win; + gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, page->m_box ); + + page->m_page = + (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data); + + page->m_parent = GTK_NOTEBOOK(m_widget); + + gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", + GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); + if (!page->m_page) { wxLogFatalError( "Notebook page creation error" ); @@ -353,29 +417,23 @@ void wxNotebook::AddChild( wxWindow *win ) } m_pages.Append( page ); -}; +} -void wxNotebook::OnSize(wxSizeEvent& event) +// override these 2 functions to do nothing: everything is done in OnSize +void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) ) { - // forward this event to all pages - wxNode *node = m_pages.First(); - while (node) - { - wxNotebookPage *page = (wxNotebookPage*)node->Data(); - page->m_clientPanel->ProcessEvent(event); + // don't set the sizes of the pages - their correct size is not yet known + wxControl::SetConstraintSizes(FALSE); +} - node = node->Next(); - }; +bool wxNotebook::DoPhase( int WXUNUSED(nPhase) ) +{ + return TRUE; } //----------------------------------------------------------------------------- -// wxTabEvent +// wxNotebookEvent //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent) - -wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) : - wxCommandEvent(commandType, id) -{ -}; +IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)