#include "wx/log.h"
#include "wx/utils.h"
#include "wx/panel.h"
+ #include "wx/msgdlg.h"
+ #include "wx/bitmap.h"
#endif
#include "wx/imaglist.h"
-#include "wx/bitmap.h"
#include "wx/fontutil.h"
#include "wx/gtk1/private.h"
#include <gdk/gdkkeysyms.h>
-#include "wx/msgdlg.h"
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
wxGtkNotebookPage()
{
m_image = -1;
- m_page = (GtkNotebookPage *) NULL;
- m_box = (GtkWidget *) NULL;
+ m_page = NULL;
+ m_box = NULL;
}
wxString m_text;
// are you trying to call SetSelection() from a notebook event handler?
// you shouldn't!
wxCHECK_RET( !notebook->m_inSwitchPage,
- _T("gtk_notebook_page_change_callback reentered") );
+ wxT("gtk_notebook_page_change_callback reentered") );
notebook->m_inSwitchPage = true;
if (g_isIdle)
int old = notebook->GetSelection();
- wxNotebookEvent eventChanging( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
- notebook->GetId(), page, old );
- eventChanging.SetEventObject( notebook );
-
- if ( (notebook->GetEventHandler()->ProcessEvent(eventChanging)) &&
- !eventChanging.IsAllowed() )
- {
- /* program doesn't allow the page change */
- gtk_signal_emit_stop_by_name( GTK_OBJECT(notebook->m_widget),
- "switch_page" );
- }
- else // change allowed
+ if (notebook->m_skipNextPageChangeEvent)
{
+ // this event was programmatically generated by ChangeSelection() and thus must
+ // be skipped
+ notebook->m_skipNextPageChangeEvent = false;
+
// make wxNotebook::GetSelection() return the correct (i.e. consistent
- // with wxNotebookEvent::GetSelection()) value even though the page is
+ // with wxBookCtrlEvent::GetSelection()) value even though the page is
// not really changed in GTK+
- notebook->m_selection = page;
+ notebook->SetSelection(page);
+ }
+ else
+ {
+ if ( !notebook->SendPageChangingEvent(page) )
+ {
+ // program doesn't allow the page change
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(notebook->m_widget), "switch_page");
+ }
+ else // change allowed
+ {
+ // make wxNotebook::GetSelection() return the correct (i.e. consistent
+ // with wxBookCtrlEvent::GetSelection()) value even though the page is
+ // not really changed in GTK+
+ notebook->SetSelection(page);
- wxNotebookEvent eventChanged( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- notebook->GetId(), page, old );
- eventChanged.SetEventObject( notebook );
- notebook->GetEventHandler()->ProcessEvent( eventChanged );
+ notebook->SendPageChangedEvent(old);
+ }
}
notebook->m_inSwitchPage = FALSE;
if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
{
int sel = notebook->GetSelection();
- if (sel == -1)
+ if (sel == wxNOT_FOUND)
return TRUE;
wxGtkNotebookPage *nb_page = notebook->GetNotebookPage(sel);
- wxCHECK_MSG( nb_page, FALSE, _T("invalid selection in wxNotebook") );
+ wxCHECK_MSG( nb_page, FALSE, wxT("invalid selection in wxNotebook") );
wxNavigationKeyEvent event;
event.SetEventObject( notebook );
event.SetCurrentFocus( notebook );
wxNotebookPage *client = notebook->GetPage(sel);
- if ( !client->GetEventHandler()->ProcessEvent( event ) )
+ if ( !client->HandleWindowEvent( event ) )
{
client->SetFocus();
}
// wxNotebook
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
-
-BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
END_EVENT_TABLE()
m_padding = 0;
m_inSwitchPage = false;
- m_imageList = (wxImageList *) NULL;
- m_selection = -1;
m_themeEnabled = true;
}
m_acceptsFocus = true;
m_insertCallback = (wxInsertChildFunction)wxInsertChildInNotebook;
+ if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+ style |= wxBK_TOP;
+
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
int wxNotebook::GetSelection() const
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
- if ( m_selection == -1 )
+ if ( m_selection == wxNOT_FOUND )
{
GList *nb_pages = GTK_NOTEBOOK(m_widget)->children;
gpointer cur = notebook->cur_page;
if ( cur != NULL )
{
- wxConstCast(this, wxNotebook)->m_selection =
- g_list_index( nb_pages, cur );
+ const_cast<wxNotebook *>(this)->
+ SetSelection(g_list_index( nb_pages, cur ));
}
}
}
wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const
{
- wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") );
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid notebook") );
- wxCHECK_MSG( page < (int)m_pagesData.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") );
+ wxCHECK_MSG( page < (int)m_pagesData.GetCount(), NULL, wxT("invalid notebook index") );
return m_pagesData.Item(page)->GetData();
}
-int wxNotebook::SetSelection( size_t page )
+int wxNotebook::DoSetSelection( size_t page, int flags )
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid notebook") );
wxCHECK_MSG( page < m_pagesData.GetCount(), -1, wxT("invalid notebook index") );
int selOld = GetSelection();
+ if ( !(flags & SetSelection_SendEvent) )
+ m_skipNextPageChangeEvent = true;
+
// cache the selection
m_selection = page;
gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page );
+ // gtk_notebook_set_current_page is supposed to emit the switch-page signal
+ // which should be caught by our gtk_notebook_page_change_callback which
+ // should have reset the flag to false, check it:
+ wxASSERT_LEVEL_2_MSG(
+ (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
+ "internal error in selection events generation"
+ );
+
wxNotebookPage *client = GetPage(page);
if ( client )
client->SetFocus();
if (image == -1 && nb_page->m_image == -1)
return true; /* Case 1): Nothing to do. */
- GtkWidget *pixmapwid = (GtkWidget*) NULL;
+ GtkWidget *pixmapwid = NULL;
if (nb_page->m_image != -1)
{
}
/* Only cases 3) and 4) left */
- wxASSERT( m_imageList != NULL ); /* Just in case */
+ wxASSERT( HasImageList() ); /* Just in case */
/* Construct the new pixmap */
- const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
+ const wxBitmap *bmp = GetImageList()->GetBitmapPtr(image);
GdkPixmap *pixmap = bmp->GetPixmap();
- GdkBitmap *mask = (GdkBitmap*) NULL;
+ GdkBitmap *mask = NULL;
if ( bmp->GetMask() )
{
mask = bmp->GetMask()->GetBitmap();
while (m_pagesData.GetCount() > 0)
DeletePage( m_pagesData.GetCount()-1 );
- wxASSERT_MSG( GetPageCount() == 0, _T("all pages must have been deleted") );
+ wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") );
InvalidateBestSize();
return wxNotebookBase::DeleteAllPages();
wxNotebookPage *wxNotebook::DoRemovePage( size_t page )
{
- if ( m_selection != -1 && (size_t)m_selection >= page )
+ if ( m_selection != wxNOT_FOUND && (size_t)m_selection >= page )
{
// the index will become invalid after the page is deleted
- m_selection = -1;
+ m_selection = wxNOT_FOUND;
}
wxNotebookPage *client = wxNotebookBase::DoRemovePage(page);
wxT("Can't add a page whose parent is not the notebook!") );
wxCHECK_MSG( position <= GetPageCount(), FALSE,
- _T("invalid page index in wxNotebookPage::InsertPage()") );
+ wxT("invalid page index in wxNotebookPage::InsertPage()") );
// Hack Alert! (Part II): See above in wxInsertChildInNotebook callback
// why this has to be done. NOTE: using gtk_widget_unparent here does not
if (imageId != -1)
{
- wxASSERT( m_imageList != NULL );
+ wxASSERT( HasImageList() );
- const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
+ const wxBitmap *bmp = GetImageList()->GetBitmapPtr(imageId);
GdkPixmap *pixmap = bmp->GetPixmap();
- GdkBitmap *mask = (GdkBitmap*) NULL;
+ GdkBitmap *mask = NULL;
if ( bmp->GetMask() )
{
mask = bmp->GetMask()->GetBitmap();
if ( pixmap && IsPointInsideWidget(pt, pixmap, x, y) )
{
- *flags = wxNB_HITTEST_ONICON;
+ *flags = wxBK_HITTEST_ONICON;
}
else if ( IsPointInsideWidget(pt, GTK_WIDGET(nb_page->m_label), x, y) )
{
- *flags = wxNB_HITTEST_ONLABEL;
+ *flags = wxBK_HITTEST_ONLABEL;
}
else
{
- *flags = wxNB_HITTEST_ONITEM;
+ *flags = wxBK_HITTEST_ONITEM;
}
}
}
if ( flags )
- *flags = wxNB_HITTEST_NOWHERE;
+ *flags = wxBK_HITTEST_NOWHERE;
return wxNOT_FOUND;
}
return GetDefaultAttributesFromGTKWidget(gtk_notebook_new);
}
-//-----------------------------------------------------------------------------
-// wxNotebookEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
-
#endif
projects / wxWidgets.git / blobdiff