AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Experimental notebook API

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1998-06-15 09:21:45 +00:00
parent 38009d396d
commit 8aadf22734
4 changed files with 106 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/notebook.h
View File

@ -25,9 +25,8 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxImageList; class wxImageList;
class wxPanel;
class wxNotebook; class wxNotebook;
class wxNotebookPage;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
@ -59,6 +58,7 @@ class wxNotebook: public wxControl
wxString GetPageText( const int page ) const; wxString GetPageText( const int page ) const;
int GetPageImage( const int page ) const; int GetPageImage( const int page ) const;
void* GetPageData( const int page ) const; void* GetPageData( const int page ) const;
wxNotebookPage* GetNotebookPage(int page) const;
int SetSelection( const int page ); int SetSelection( const int page );
void SetImageList( wxImageList* imageList ); void SetImageList( wxImageList* imageList );
bool SetPageText( const int page, const wxString& text ); bool SetPageText( const int page, const wxString& text );
@ -68,8 +68,8 @@ class wxNotebook: public wxControl
void SetPadding( const wxSize& padding ); void SetPadding( const wxSize& padding );
bool DeleteAllPages(void); bool DeleteAllPages(void);
bool DeletePage( const int page ); bool DeletePage( const int page );
wxPanel *CreatePage( const int page, const wxString& text, const int imageId = -1, void* data = NULL ); bool AddPage( const int page, const wxString& text, wxWindow* win, const int imageId = -1, void* data = NULL );
wxPanel *GetPanel( const int page ); wxWindow *GetPageWindow( const int page ) const;
// overriden to do nothing // overriden to do nothing
virtual void AddChild( wxWindow *win ); virtual void AddChild( wxWindow *win );

8
include/wx/gtk1/notebook.h
View File

@ -25,9 +25,8 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class wxImageList; class wxImageList;
class wxPanel;
class wxNotebook; class wxNotebook;
class wxNotebookPage;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
@ -59,6 +58,7 @@ class wxNotebook: public wxControl
wxString GetPageText( const int page ) const; wxString GetPageText( const int page ) const;
int GetPageImage( const int page ) const; int GetPageImage( const int page ) const;
void* GetPageData( const int page ) const; void* GetPageData( const int page ) const;
wxNotebookPage* GetNotebookPage(int page) const;
int SetSelection( const int page ); int SetSelection( const int page );
void SetImageList( wxImageList* imageList ); void SetImageList( wxImageList* imageList );
bool SetPageText( const int page, const wxString& text ); bool SetPageText( const int page, const wxString& text );
@ -68,8 +68,8 @@ class wxNotebook: public wxControl
void SetPadding( const wxSize& padding ); void SetPadding( const wxSize& padding );
bool DeleteAllPages(void); bool DeleteAllPages(void);
bool DeletePage( const int page ); bool DeletePage( const int page );
wxPanel *CreatePage( const int page, const wxString& text, const int imageId = -1, void* data = NULL ); bool AddPage( const int page, const wxString& text, wxWindow* win, const int imageId = -1, void* data = NULL );
wxPanel *GetPanel( const int page ); wxWindow *GetPageWindow( const int page ) const;
// overriden to do nothing // overriden to do nothing
virtual void AddChild( wxWindow *win ); virtual void AddChild( wxWindow *win );

144
src/gtk/notebook.cpp
View File

@ -30,7 +30,7 @@ class wxNotebookPage: public wxObject
int m_image; int m_image;
void *m_clientData; void *m_clientData;
GtkNotebookPage *m_page; GtkNotebookPage *m_page;
wxPanel *m_clientPanel; wxWindow *m_clientPanel;
wxNotebookPage(void) wxNotebookPage(void)
{ {
@ -131,37 +131,32 @@ int wxNotebook::GetRowCount(void) const
wxString wxNotebook::GetPageText( const int page ) const wxString wxNotebook::GetPageText( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
wxNode *node = m_pages.First(); return nb_page->m_text;
while (node) else
{ return "";
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return "";
return nb_page->m_text;
}; };
int wxNotebook::GetPageImage( const int page ) const int wxNotebook::GetPageImage( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
wxNode *node = m_pages.First(); return nb_page->m_image;
while (node) else
{ return NULL;
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return -1;
return nb_page->m_image;
}; };
void* wxNotebook::GetPageData( const int page ) const 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 = NULL;
@ -173,22 +168,13 @@ void* wxNotebook::GetPageData( const int page ) const
node = node->Next(); node = node->Next();
}; };
if (!node) return NULL; if (!node) return NULL;
return nb_page;
return nb_page->m_clientData;
}; };
int wxNotebook::SetSelection( const int page ) int wxNotebook::SetSelection( const int page )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return -1;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return -1;
int page_num = 0; int page_num = 0;
GList *child = GTK_NOTEBOOK(m_widget)->children; GList *child = GTK_NOTEBOOK(m_widget)->children;
@ -213,16 +199,8 @@ void wxNotebook::SetImageList( wxImageList* imageList )
bool wxNotebook::SetPageText( const int page, const wxString &text ) bool wxNotebook::SetPageText( const int page, const wxString &text )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_text = text; nb_page->m_text = text;
@ -233,16 +211,9 @@ bool wxNotebook::SetPageText( const int page, const wxString &text )
bool wxNotebook::SetPageImage( const int page, const int image ) bool wxNotebook::SetPageImage( const int page, const int image )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page)
wxNode *node = m_pages.First(); return FALSE;
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_image = image; nb_page->m_image = image;
@ -253,17 +224,9 @@ bool wxNotebook::SetPageImage( const int page, const int image )
bool wxNotebook::SetPageData( const int page, void* data ) bool wxNotebook::SetPageData( const int page, void* data )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_clientData = data; nb_page->m_clientData = data;
return TRUE; return TRUE;
@ -295,16 +258,8 @@ bool wxNotebook::DeleteAllPages(void)
bool wxNotebook::DeletePage( const int page ) bool wxNotebook::DeletePage( const int page )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
int page_num = 0; int page_num = 0;
GList *child = GTK_NOTEBOOK(m_widget)->children; GList *child = GTK_NOTEBOOK(m_widget)->children;
@ -327,10 +282,10 @@ bool wxNotebook::DeletePage( const int page )
return TRUE; return TRUE;
}; };
wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data ) bool wxNotebook::AddPage( const int item, const wxString &text, wxWindow* win, const int imageId, void* data )
{ {
wxNotebookPage *page = new wxNotebookPage; wxNotebookPage *page = new wxNotebookPage;
page->m_text = text; page->m_text = text;
if (page->m_text.IsNull()) page->m_text = ""; if (page->m_text.IsNull()) page->m_text = "";
page->m_id = item; page->m_id = item;
@ -338,33 +293,32 @@ wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int
page->m_clientData = data; page->m_clientData = data;
m_frame = gtk_label_new( page->m_text ); m_frame = gtk_label_new( page->m_text );
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 ); gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) ); page->m_clientPanel = win;
// page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
m_frame = NULL; m_frame = NULL;
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 );
if (!page->m_page) wxFatalError( "Notebook page creation error" ); if (!page->m_page)
{
wxFatalError( "Notebook page creation error" );
return FALSE;
}
m_pages.Append( page ); m_pages.Append( page );
return page->m_clientPanel; return TRUE;
}; };
wxPanel *wxNotebook::GetPanel( const int page ) wxWindow *wxNotebook::GetPageWindow( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return NULL;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return NULL;
return nb_page->m_clientPanel; return nb_page->m_clientPanel;
}; };
@ -373,7 +327,7 @@ void wxNotebook::AddChild( wxWindow *win )
{ {
if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." ); if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame ); // gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

144
src/gtk1/notebook.cpp
View File

@ -30,7 +30,7 @@ class wxNotebookPage: public wxObject
int m_image; int m_image;
void *m_clientData; void *m_clientData;
GtkNotebookPage *m_page; GtkNotebookPage *m_page;
wxPanel *m_clientPanel; wxWindow *m_clientPanel;
wxNotebookPage(void) wxNotebookPage(void)
{ {
@ -131,37 +131,32 @@ int wxNotebook::GetRowCount(void) const
wxString wxNotebook::GetPageText( const int page ) const wxString wxNotebook::GetPageText( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
wxNode *node = m_pages.First(); return nb_page->m_text;
while (node) else
{ return "";
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return "";
return nb_page->m_text;
}; };
int wxNotebook::GetPageImage( const int page ) const int wxNotebook::GetPageImage( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
wxNode *node = m_pages.First(); return nb_page->m_image;
while (node) else
{ return NULL;
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return -1;
return nb_page->m_image;
}; };
void* wxNotebook::GetPageData( const int page ) const 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 = NULL;
@ -173,22 +168,13 @@ void* wxNotebook::GetPageData( const int page ) const
node = node->Next(); node = node->Next();
}; };
if (!node) return NULL; if (!node) return NULL;
return nb_page;
return nb_page->m_clientData;
}; };
int wxNotebook::SetSelection( const int page ) int wxNotebook::SetSelection( const int page )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return -1;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return -1;
int page_num = 0; int page_num = 0;
GList *child = GTK_NOTEBOOK(m_widget)->children; GList *child = GTK_NOTEBOOK(m_widget)->children;
@ -213,16 +199,8 @@ void wxNotebook::SetImageList( wxImageList* imageList )
bool wxNotebook::SetPageText( const int page, const wxString &text ) bool wxNotebook::SetPageText( const int page, const wxString &text )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_text = text; nb_page->m_text = text;
@ -233,16 +211,9 @@ bool wxNotebook::SetPageText( const int page, const wxString &text )
bool wxNotebook::SetPageImage( const int page, const int image ) bool wxNotebook::SetPageImage( const int page, const int image )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page)
wxNode *node = m_pages.First(); return FALSE;
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_image = image; nb_page->m_image = image;
@ -253,17 +224,9 @@ bool wxNotebook::SetPageImage( const int page, const int image )
bool wxNotebook::SetPageData( const int page, void* data ) bool wxNotebook::SetPageData( const int page, void* data )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
nb_page->m_clientData = data; nb_page->m_clientData = data;
return TRUE; return TRUE;
@ -295,16 +258,8 @@ bool wxNotebook::DeleteAllPages(void)
bool wxNotebook::DeletePage( const int page ) bool wxNotebook::DeletePage( const int page )
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return FALSE;
int page_num = 0; int page_num = 0;
GList *child = GTK_NOTEBOOK(m_widget)->children; GList *child = GTK_NOTEBOOK(m_widget)->children;
@ -327,10 +282,10 @@ bool wxNotebook::DeletePage( const int page )
return TRUE; return TRUE;
}; };
wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data ) bool wxNotebook::AddPage( const int item, const wxString &text, wxWindow* win, const int imageId, void* data )
{ {
wxNotebookPage *page = new wxNotebookPage; wxNotebookPage *page = new wxNotebookPage;
page->m_text = text; page->m_text = text;
if (page->m_text.IsNull()) page->m_text = ""; if (page->m_text.IsNull()) page->m_text = "";
page->m_id = item; page->m_id = item;
@ -338,33 +293,32 @@ wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int
page->m_clientData = data; page->m_clientData = data;
m_frame = gtk_label_new( page->m_text ); m_frame = gtk_label_new( page->m_text );
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 ); gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) ); page->m_clientPanel = win;
// page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
m_frame = NULL; m_frame = NULL;
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 );
if (!page->m_page) wxFatalError( "Notebook page creation error" ); if (!page->m_page)
{
wxFatalError( "Notebook page creation error" );
return FALSE;
}
m_pages.Append( page ); m_pages.Append( page );
return page->m_clientPanel; return TRUE;
}; };
wxPanel *wxNotebook::GetPanel( const int page ) wxWindow *wxNotebook::GetPageWindow( const int page ) const
{ {
wxNotebookPage *nb_page = NULL; wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return NULL;
wxNode *node = m_pages.First();
while (node)
{
nb_page = (wxNotebookPage*)node->Data();
if (nb_page->m_id == page) break;
node = node->Next();
};
if (!node) return NULL;
return nb_page->m_clientPanel; return nb_page->m_clientPanel;
}; };
@ -373,7 +327,7 @@ void wxNotebook::AddChild( wxWindow *win )
{ {
if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." ); if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame ); // gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------