#endif
#include "wx/notebook.h"
+
+#if wxUSE_NOTEBOOK
+
#include "wx/panel.h"
#include "wx/utils.h"
#include "wx/imaglist.h"
#include "wx/intl.h"
#include "wx/log.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
#include "gdk/gdkkeysyms.h"
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
+//-----------------------------------------------------------------------------
+// debug
+//-----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window );
+
+#endif
+
//-----------------------------------------------------------------------------
// wxNotebookPage
//-----------------------------------------------------------------------------
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;
- m_added = FALSE;
- }
-
- /*
- mark page as "added' to the notebook, return FALSE if the page was
- already added
- */
-
- bool Add()
- {
- if ( WasAdded() )
- return FALSE;
-
- m_added = TRUE;
- return TRUE;
}
- bool WasAdded() const { return m_added; }
-
- 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
-
-private:
- bool m_added;
};
//-----------------------------------------------------------------------------
static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
GtkNotebookPage *WXUNUSED(page),
- gint nPage,
- gpointer data)
+ gint page,
+ wxNotebook *notebook )
{
- wxNotebook *notebook = (wxNotebook *)data;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
int old = notebook->GetSelection();
- // TODO: emulate PAGE_CHANGING event
+ wxNotebookEvent event1( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+ notebook->GetId(), page, old );
+ event1.SetEventObject( notebook );
+
+ if ((notebook->GetEventHandler()->ProcessEvent( event1 )) &&
+ !event1.IsAllowed() )
+ {
+ /* program doesn't allow the page change */
+ gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget), "switch_page" );
+ return;
+ }
- wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- notebook->GetId(), nPage, old );
- event.SetEventObject( notebook );
- notebook->GetEventHandler()->ProcessEvent( event );
+ wxNotebookEvent event2( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+ notebook->GetId(), page, old );
+ event2.SetEventObject( notebook );
+ notebook->GetEventHandler()->ProcessEvent( event2 );
}
//-----------------------------------------------------------------------------
static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) &&
(win->m_width == alloc->width) &&
{
return;
}
-
+
win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-
- if (win->GetAutoLayout()) win->Layout();
+
+ if (win->GetAutoLayout())
+ win->Layout();
}
//-----------------------------------------------------------------------------
-// "key_press_event"
+// "realize" from m_widget
//-----------------------------------------------------------------------------
-static gint
-gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNotebook *notebook )
+/* GTK 1.2 up to version 1.2.5 is broken so that we have to call a queue_resize
+ here in order to take repositioning before showing to take effect. */
+
+static gint
+gtk_notebook_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
{
- if (g_blockEventsOnDrag) return FALSE;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- if (!notebook->HasVMT()) return FALSE;
+ gtk_widget_queue_resize( win->m_widget );
- 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" );
-
- page->m_client->SetFocus();
-
- return TRUE;
+ return FALSE;
}
//-----------------------------------------------------------------------------
// InsertChild callback for wxNotebook
//-----------------------------------------------------------------------------
-static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
+static void wxInsertChildInNotebook( wxNotebook* WXUNUSED(parent), wxWindow* WXUNUSED(child) )
{
- wxNotebookPage *page = new wxNotebookPage();
-
- page->m_id = parent->GetPageCount();
-
- page->m_box = gtk_hbox_new (FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
-
- GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-
- page->m_client = child;
- gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
-
- page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-
- page->m_parent = notebook;
-
- gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-
- wxASSERT_MSG( page->m_page, "Notebook page creation error" );
-
- parent->m_pages.Append( page );
+ /* we don't do anything here but pray */
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+ EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+END_EVENT_TABLE()
+
void wxNotebook::Init()
{
m_imageList = (wxImageList *) NULL;
m_pages.DeleteContents( TRUE );
- m_idHandler = 0;
+ m_lastSelection = -1;
}
wxNotebook::wxNotebook()
wxNotebook::~wxNotebook()
{
- // don't generate change page events any more
- if (m_idHandler != 0)
- gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
+ /* don't generate change page events any more */
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
DeleteAllPages();
}
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, "wxNotebook::m_widget", name );
+ debug_focus_in( m_widget, wxT("wxNotebook::m_widget"), name );
#endif
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 );
-
- m_parent->AddChild( this );
+ gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
- (m_parent->m_insertCallback)( m_parent, this );
+ 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;
}
-int wxNotebook::GetSelection() const
+void wxNotebook::SetFocus()
{
- wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
+ if (m_pages.GetCount() == 0) return;
- if (m_pages.Number() == 0) return -1;
+ wxNode *node = m_pages.Nth( GetSelection() );
- GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
- if (!g_page) return -1;
+ if (!node) return;
- wxNotebookPage *page = (wxNotebookPage *) NULL;
+ wxNotebookPage *page = (wxNotebookPage*) node->Data();
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxNotebookPage*)node->Data();
+ page->m_client->SetFocus();
+}
- if ((page->m_page == g_page) || (page->m_page == (GtkNotebookPage*)NULL))
- {
- // page->m_page is NULL directly after gtk_notebook_append. gtk emits
- // "switch_page" then and we ask for GetSelection() in the handler for
- // "switch_page". otherwise m_page should never be NULL. all this
- // might also be wrong.
- break;
- }
- node = node->Next();
- }
+int wxNotebook::GetSelection() const
+{
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+
+ GList *pages = GTK_NOTEBOOK(m_widget)->children;
- wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
+ if (g_list_length(pages) == 0) return -1;
- return page->m_id;
+ GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
+
+ if (notebook->cur_page == NULL) return m_lastSelection;
+
+ return g_list_index( pages, (gpointer)(notebook->cur_page) );
}
int wxNotebook::GetPageCount() const
{
- // count only the pages which were already added to the notebook for MSW
- // compatibility (and, in fact, this behaviour makes more sense anyhow
- // because only the added pages are shown)
-
- int n = 0;
- for ( wxNode *node = m_pages.First(); node; node = node->Next() )
- {
- wxNotebookPage *page = (wxNotebookPage*)node->Data();
-
- if (page->WasAdded()) n++;
- }
-
- return n;
+ return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children );
}
int wxNotebook::GetRowCount() const
wxString wxNotebook::GetPageText( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, "", "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, 0, "invalid notebook" );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
wxNotebookPage* nb_page = GetNotebookPage(page);
if (nb_page)
return nb_page->m_image;
else
- return 0;
+ return -1;
}
-wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
+wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*)NULL, "invalid notebook" );
-
- wxNotebookPage *nb_page = (wxNotebookPage *) NULL;
+ wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") );
- wxNode *node = m_pages.First();
- while (node)
- {
- nb_page = (wxNotebookPage*)node->Data();
- if (nb_page->m_id == page)
- return nb_page;
- node = node->Next();
- }
-
- wxFAIL_MSG( "Notebook page not found!" );
-
- return (wxNotebookPage *) NULL;
+ wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") );
+
+ wxNode *node = m_pages.Nth( page );
+
+ return (wxNotebookPage *) node->Data();
}
int wxNotebook::SetSelection( int page )
{
- wxCHECK_MSG( m_widget != NULL, -1, "invalid notebook" );
-
- int selOld = GetSelection();
- wxNotebookPage* nb_page = GetNotebookPage(page);
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
- if (!nb_page) return -1;
+ wxCHECK_MSG( page < (int)m_pages.GetCount(), -1, wxT("invalid notebook index") );
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- 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 );
+ int selOld = GetSelection();
+
+ gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
return selOld;
}
-void wxNotebook::AdvanceSelection( bool bForward )
+void wxNotebook::AdvanceSelection( bool forward )
{
- wxCHECK_RET( m_widget != NULL, "invalid notebook" );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid notebook") );
int sel = GetSelection();
int max = GetPageCount();
- if (bForward)
+ if (forward)
SetSelection( sel == max ? 0 : sel + 1 );
else
- SetSelection( sel == 0 ? max : sel - 1 );
+ SetSelection( sel == 0 ? max-1 : sel - 1 );
}
void wxNotebook::SetImageList( wxImageList* imageList )
bool wxNotebook::SetPageText( int page, const wxString &text )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
wxNotebookPage* nb_page = GetNotebookPage(page);
- if (!nb_page) return FALSE;
+ wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") );
nb_page->m_text = text;
- if (nb_page->m_text.IsEmpty()) nb_page->m_text = "";
-
- gtk_label_set(nb_page->m_label, nb_page->m_text);
+ gtk_label_set( nb_page->m_label, nb_page->m_text.mbc_str() );
return TRUE;
}
bool wxNotebook::SetPageImage( int page, int image )
{
/* HvdH 28-12-98: now it works, but it's a bit of a kludge */
-
+
wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
-
+
/* Optimization posibility: return immediately if image unchanged.
* Not enabled because it may break existing (stupid) code that
* manipulates the imagelist to cycle images */
-
+
/* if (image == nb_page->m_image) return TRUE; */
-
- /* For different cases:
+
+ /* For different cases:
1) no image -> no image
2) image -> no image
3) no image -> image
4) image -> image */
-
+
if (image == -1 && nb_page->m_image == -1)
return TRUE; /* Case 1): Nothing to do. */
-
- GtkWidget *pixmapwid = NULL;
-
- if (nb_page->m_image != -1)
+
+ GtkWidget *pixmapwid = (GtkWidget*) NULL;
+
+ if (nb_page->m_image != -1)
{
/* Case 2) or 4). There is already an image in the gtkhbox. Let's find it */
-
+
GList *child = gtk_container_children(GTK_CONTAINER(nb_page->m_box));
while (child)
{
- if (GTK_IS_PIXMAP(child->data))
+ if (GTK_IS_PIXMAP(child->data))
{
pixmapwid = GTK_WIDGET(child->data);
break;
}
child = child->next;
}
-
+
/* We should have the pixmap widget now */
- wxASSERT(pixmapwid != NULL);
-
- if (image == -1)
+ wxASSERT(pixmapwid != NULL);
+
+ if (image == -1)
{
/* If there's no new widget, just remove the old from the box */
gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
return TRUE; /* Case 2) */
}
}
-
+
/* Only cases 3) and 4) left */
wxASSERT( m_imageList != NULL ); /* Just in case */
-
+
/* Construct the new pixmap */
const wxBitmap *bmp = m_imageList->GetBitmap(image);
GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = (GdkBitmap*) NULL;
- if ( bmp->GetMask() )
+ if ( bmp->GetMask() )
{
mask = bmp->GetMask()->GetBitmap();
}
-
- if (pixmapwid == NULL)
+
+ if (pixmapwid == NULL)
{
/* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
pixmapwid = gtk_pixmap_new (pixmap, mask );
-
+
/* CHECKME: Are these pack flags okay? */
gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, 3);
gtk_widget_show(pixmapwid);
}
- else
+ else
{
/* Case 4) Simply replace the pixmap */
gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask);
}
-
+
nb_page->m_image = image;
return TRUE;
void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
{
- wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+ wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
}
void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
{
- wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+ wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
}
-bool wxNotebook::DeleteAllPages()
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
-
- wxNode *page_node = m_pages.First();
- while (page_node)
- {
- wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+ wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+}
- DeletePage( page->m_id );
+bool wxNotebook::DeleteAllPages()
+{
+ wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
- page_node = m_pages.First();
- }
+ while (m_pages.GetCount() > 0)
+ DeletePage( m_pages.GetCount()-1 );
return TRUE;
}
wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page) return FALSE;
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
- }
-
- wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
-
- delete nb_page->m_client;
-
+ /* 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;
}
bool wxNotebook::RemovePage( int page )
{
wxNotebookPage* nb_page = GetNotebookPage(page);
+
if (!nb_page) return FALSE;
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
- }
-
- wxCHECK_MSG( child != NULL, FALSE, "illegal notebook index" );
-
- gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+ gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page );
m_pages.DeleteObject( nb_page );
return TRUE;
}
-bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
- bool select, int imageId)
+bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
+ bool select, int imageId )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, "invalid notebook" );
+ wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") );
- /* we've created the notebook page in AddChild(). Now we just have to set
- the caption for the page and set the others parameters. */
+ wxCHECK_MSG( win->GetParent() == this, FALSE,
+ wxT("Can't add a page whose parent is not the notebook!") );
- wxNotebookPage *page = (wxNotebookPage *) NULL;
+ /* 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);
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxNotebookPage*)node->Data();
- if ( page->m_client == win ) break;
- node = node->Next();
- }
+ 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 );
+ gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
+
+ gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
+ GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
- wxCHECK_MSG( page != NULL, FALSE,
- "Can't add a page whose parent is not the notebook!" );
+ if (position < 0)
+ gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
+ else
+ gtk_notebook_insert_page( notebook, win->m_widget, page->m_box, position );
- wxCHECK_MSG( page->Add(), FALSE,
- "Can't add the same page twice to a notebook." );
+ 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 );
gtk_widget_show(pixmapwid);
}
- /* then set the attributes */
+ /* set the label text */
page->m_text = text;
- if (page->m_text.IsEmpty()) page->m_text = "";
- page->m_image = imageId;
- page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
- gtk_box_pack_end( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);
+ 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 );
- /* @@@: what does this do? do we still need it?
- gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5); */
+ /* show the label */
+ gtk_widget_show( GTK_WIDGET(page->m_label) );
- gtk_widget_show((GtkWidget *)page->m_label);
+ if (select && (m_pages.GetCount() > 1))
+ {
+ if (position < 0)
+ SetSelection( GetPageCount()-1 );
+ else
+ SetSelection( position );
+ }
- if (select) SetSelection( GetPageCount()-1 );
+ gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
+ GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
return TRUE;
}
+bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
+ bool select, int imageId)
+{
+ return InsertPage( -1, win, text, select, imageId );
+}
+
+void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
+{
+ if (event.IsWindowChange())
+ AdvanceSelection( event.GetDirection() );
+ else
+ event.Skip();
+}
+
wxWindow *wxNotebook::GetPage( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, "invalid notebook" );
+ wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") );
wxNotebookPage* nb_page = GetNotebookPage(page);
if (!nb_page)
gtk_widget_set_style( m_widget, m_widgetStyle );
}
+bool wxNotebook::IsOwnGtkWindow( GdkWindow *window )
+{
+ return ((m_widget->window == window) ||
+ (GTK_NOTEBOOK(m_widget)->panel == window));
+}
+
//-----------------------------------------------------------------------------
// wxNotebookEvent
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+#endif
projects / wxWidgets.git / blobdiff