X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..4c444f19cf1bdb3cb26bb3c123434fe23c808093:/src/gtk/notebook.cpp diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index eb1ac6d1b5..bbfd78056a 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -19,13 +19,40 @@ #include "wx/intl.h" #include "wx/log.h" +//----------------------------------------------------------------------------- +// wxNotebookPage +//----------------------------------------------------------------------------- + +class wxNotebookPage: public wxObject +{ +public: + wxNotebookPage() + { + m_id = -1; + m_text = ""; + m_image = -1; + m_page = NULL; + m_client = NULL; + m_parent = NULL; + } + +//private: + int m_id; + wxString m_text; + int m_image; + GtkNotebookPage *m_page; + GtkLabel *m_label; + wxWindow *m_client; + GtkNotebook *m_parent; +}; + //----------------------------------------------------------------------------- // GTK callbacks //----------------------------------------------------------------------------- // page change callback -static void gtk_notebook_page_change_callback(GtkNotebook *widget, - GtkNotebookPage *page, +static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget), + GtkNotebookPage *WXUNUSED(page), gint nPage, gpointer data) { @@ -42,39 +69,47 @@ static void gtk_notebook_page_change_callback(GtkNotebook *widget, notebook->ProcessEvent(event); } -//----------------------------------------------------------------------------- -// wxNotebookPage -//----------------------------------------------------------------------------- - -class wxNotebookPage: public wxObject +static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { -public: - wxNotebookPage() + 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)) { - m_id = -1; - m_text = ""; - m_image = -1; - m_page = NULL; - m_clientPanel = NULL; - }; + return; + } -//private: - int m_id; - wxString m_text; - int m_image; - GtkNotebookPage *m_page; - GtkLabel *m_label; - wxWindow *m_clientPanel; -}; +/* + printf( "OnResize from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( " .\n" ); + + printf( " Old: X: %d Y: %d ", win->m_x, win->m_y ); + printf( " W: %d H: %d ", win->m_width, win->m_height ); + printf( " .\n" ); + + printf( " New: X: %d Y: %d ", alloc->x, alloc->y ); + printf( " W: %d H: %d ", alloc->width, alloc->height ); + printf( " .\n" ); +*/ + + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); + +/* + printf( " Res: X: %d Y: %d ", win->m_x, win->m_y ); + printf( " W: %d H: %d ", win->m_width, win->m_height ); + printf( " .\n" ); +*/ +} //----------------------------------------------------------------------------- // wxNotebook //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxNotebook, wxControl) - EVT_SIZE(wxNotebook::OnSize) -END_EVENT_TABLE() - IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl) void wxNotebook::Init() @@ -87,7 +122,7 @@ void wxNotebook::Init() wxNotebook::wxNotebook() { Init(); -}; +} wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -95,7 +130,7 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id, { Init(); Create( parent, id, pos, size, style, name ); -}; +} wxNotebook::~wxNotebook() { @@ -103,10 +138,8 @@ wxNotebook::~wxNotebook() if ( m_idHandler != 0 ) gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler); - if (m_imageList) - delete m_imageList; DeleteAllPages(); -}; +} bool wxNotebook::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -117,6 +150,9 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, 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", @@ -129,7 +165,7 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id, Show( TRUE ); return TRUE; -}; +} int wxNotebook::GetSelection() const { @@ -147,22 +183,22 @@ int wxNotebook::GetSelection() const if (page->m_page == g_page) break; node = node->Next(); - }; + } - wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?"); + wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" ); return page->m_id; -}; +} int wxNotebook::GetPageCount() const { return m_pages.Number(); -}; +} int wxNotebook::GetRowCount() const { return 1; -}; +} wxString wxNotebook::GetPageText( int page ) const { @@ -171,7 +207,7 @@ wxString wxNotebook::GetPageText( int page ) const return nb_page->m_text; else return ""; -}; +} int wxNotebook::GetPageImage( int page ) const { @@ -180,7 +216,7 @@ int wxNotebook::GetPageImage( int page ) const return nb_page->m_image; else return 0; -}; +} wxNotebookPage* wxNotebook::GetNotebookPage(int page) const { @@ -193,12 +229,12 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const if (nb_page->m_id == page) return nb_page; node = node->Next(); - }; + } - wxLogDebug("Notebook page %d not found!", page); + wxLogDebug( "Notebook page %d not found!", page ); return NULL; -}; +} int wxNotebook::SetSelection( int page ) { @@ -215,14 +251,14 @@ int wxNotebook::SetSelection( int page ) break; page_num++; child = child->next; - }; + } if (!child) return -1; gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num ); return selOld; -}; +} void wxNotebook::AdvanceSelection(bool bForward) { @@ -240,7 +276,7 @@ void wxNotebook::AdvanceSelection(bool bForward) void wxNotebook::SetImageList( wxImageList* imageList ) { m_imageList = imageList; -}; +} bool wxNotebook::SetPageText( int page, const wxString &text ) { @@ -251,7 +287,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) nb_page->m_text = text; return TRUE; -}; +} bool wxNotebook::SetPageImage( int page, int image ) { @@ -262,17 +298,17 @@ bool wxNotebook::SetPageImage( int page, int image ) nb_page->m_image = image; return TRUE; -}; +} void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) ) { - wxFAIL_MSG("wxNotebook::SetPageSize not implemented"); -}; + wxFAIL_MSG(_("wxNotebook::SetPageSize not implemented")); +} void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) ) { - wxFAIL_MSG("wxNotebook::SetPadding not implemented"); -}; + wxFAIL_MSG(_("wxNotebook::SetPadding not implemented")); +} bool wxNotebook::DeleteAllPages() { @@ -284,10 +320,10 @@ bool wxNotebook::DeleteAllPages() DeletePage( page->m_id ); page_node = m_pages.First(); - }; + } return TRUE; -}; +} bool wxNotebook::DeletePage( int page ) { @@ -301,11 +337,11 @@ bool wxNotebook::DeletePage( 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 ); @@ -313,7 +349,7 @@ bool wxNotebook::DeletePage( int page ) m_pages.DeleteObject( nb_page ); return TRUE; -}; +} bool wxNotebook::AddPage(wxWindow* win, const wxString& text, bool bSelect, int imageId) @@ -328,13 +364,13 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, while (node) { page = (wxNotebookPage*)node->Data(); - if ( page->m_clientPanel == win ) + if ( page->m_client == win ) break; // found node = node->Next(); - }; + } wxCHECK_MSG(page != NULL, FALSE, - "Can't add a page whose parent is not the notebook!"); + _("Can't add a page whose parent is not the notebook!")); // then set the attributes page->m_text = text; @@ -348,7 +384,7 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, } return TRUE; -}; +} wxWindow *wxNotebook::GetPage( int page ) const { @@ -356,52 +392,49 @@ wxWindow *wxNotebook::GetPage( int page ) const if (!nb_page) return NULL; else - return nb_page->m_clientPanel; -}; + return nb_page->m_client; +} void wxNotebook::AddChild( wxWindow *win ) { - // @@@ normally done in wxWindow::AddChild but for some reason wxNotebook - // case is special 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); + page->m_label = (GtkLabel *)gtk_label_new(_("Handle")); + page->m_client = 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_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" ); + wxLogFatalError( _("Notebook page creation error") ); return; } 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(); - // @@@@ This -50 is completely wrong - instead, we should substract - // the height of the tabs - page->m_clientPanel->SetSize(event.GetSize().GetX(), - event.GetSize().GetY() - 50); + // 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; } //-----------------------------------------------------------------------------