m_page = NULL;
m_client = NULL;
m_parent = NULL;
- };
+ }
//private:
int m_id;
notebook->ProcessEvent(event);
}
-static void gtk_notebook_client_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
- wxNotebookPage *page )
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
{
- if (!page->m_client->HasVMT()) return;
+ 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;
+ }
/*
printf( "OnResize from " );
- if (page->m_client->GetClassInfo() && page->m_client->GetClassInfo()->GetClassName())
- printf( page->m_client->GetClassInfo()->GetClassName() );
- printf( ".\n" );
+ 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" );
*/
-
- page->m_client->SetSize( alloc->x, alloc->y+26,
- alloc->width, alloc->height );
-};
+
+ 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()
wxNotebook::wxNotebook()
{
Init();
-};
+}
wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
{
Init();
Create( parent, id, pos, size, style, name );
-};
+}
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,
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",
Show( TRUE );
return TRUE;
-};
+}
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
{
return nb_page->m_text;
else
return "";
-};
+}
int wxNotebook::GetPageImage( int page ) const
{
return nb_page->m_image;
else
return 0;
-};
+}
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 );
return NULL;
-};
+}
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)
{
void wxNotebook::SetImageList( wxImageList* imageList )
{
m_imageList = imageList;
-};
+}
bool wxNotebook::SetPageText( int page, const wxString &text )
{
nb_page->m_text = text;
return TRUE;
-};
+}
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()
{
DeletePage( page->m_id );
page_node = m_pages.First();
- };
+ }
return TRUE;
-};
+}
bool wxNotebook::DeletePage( int page )
{
if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
page_num++;
child = child->next;
- };
+ }
wxASSERT( child );
m_pages.DeleteObject( nb_page );
return TRUE;
-};
+}
bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
bool bSelect, int imageId)
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;
}
return TRUE;
-};
+}
wxWindow *wxNotebook::GetPage( int page ) const
{
return NULL;
else
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?)
- // Robert: Don't you think the code below looks different from the one
- // in wxWindow::AddChild :-)
-
m_children.Append(win);
-
wxNotebookPage *page = new wxNotebookPage();
page->m_id = GetPageCount();
- page->m_label = (GtkLabel *)gtk_label_new("Handle");
+ 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 =
+ 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(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_notebook_client_size_callback), (gpointer)page );
-
+ 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 );
-};
+}
+
+// override these 2 functions to do nothing: everything is done in OnSize
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
+{
+ // don't set the sizes of the pages - their correct size is not yet known
+ wxControl::SetConstraintSizes(FALSE);
+}
+
+bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
+{
+ return TRUE;
+}
//-----------------------------------------------------------------------------
// wxNotebookEvent
projects / wxWidgets.git / blobdiff