#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/panel.h"
+ #include "wx/msgdlg.h"
+ #include "wx/bitmap.h"
#endif
-#include "wx/panel.h"
-#include "wx/utils.h"
#include "wx/imaglist.h"
-#include "wx/log.h"
-#include "wx/bitmap.h"
#include "wx/fontutil.h"
#include "wx/gtk1/private.h"
#include <gdk/gdkkeysyms.h>
-#include "wx/msgdlg.h"
-
// ----------------------------------------------------------------------------
// events
// ----------------------------------------------------------------------------
wxCHECK_RET( !notebook->m_inSwitchPage,
_T("gtk_notebook_page_change_callback reentered") );
- notebook->m_inSwitchPage = TRUE;
+ notebook->m_inSwitchPage = true;
if (g_isIdle)
wxapp_install_idle_handler();
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 programatically 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
// not really changed in GTK+
notebook->m_selection = 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 wxNotebookEvent::GetSelection()) value even though the page is
+ // not really changed in GTK+
+ notebook->m_selection = 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;
void wxNotebook::Init()
{
m_padding = 0;
- m_inSwitchPage = FALSE;
+ m_inSwitchPage = false;
m_imageList = (wxImageList *) NULL;
m_selection = -1;
- m_themeEnabled = TRUE;
+ m_themeEnabled = true;
}
wxNotebook::wxNotebook()
const wxPoint& pos, const wxSize& size,
long style, const wxString& name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_needParent = 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 ))
{
wxFAIL_MSG( wxT("wxNoteBook creation failed") );
- return FALSE;
+ return false;
}
gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
GTK_SIGNAL_FUNC(gtk_notebook_realized_callback), (gpointer) this );
- return TRUE;
+ return true;
}
int wxNotebook::GetSelection() const
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") );
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 );
+#ifdef __WXDEBUG__
+ if ( !(flags & SetSelection_SendEvent) )
+ {
+ // gtk_notebook_set_current_page will emit the switch-page signal which will be
+ // caught by our gtk_notebook_page_change_callback which should have reset the
+ // flag to false:
+ wxASSERT(!m_skipNextPageChangeEvent);
+ }
+#endif // __WXDEBUG__
+
wxNotebookPage *client = GetPage(page);
if ( client )
client->SetFocus();
gtk_label_set( nb_page->m_label, wxGTK_CONV( nb_page->m_text ) );
- return TRUE;
+ return true;
}
bool wxNotebook::SetPageImage( size_t page, int image )
* Not enabled because it may break existing (stupid) code that
* manipulates the imagelist to cycle images */
- /* if (image == nb_page->m_image) return TRUE; */
+ /* if (image == nb_page->m_image) return true; */
/* For different cases:
1) no image -> no image
4) image -> image */
if (image == -1 && nb_page->m_image == -1)
- return TRUE; /* Case 1): Nothing to do. */
+ return true; /* Case 1): Nothing to do. */
GtkWidget *pixmapwid = (GtkWidget*) NULL;
gtk_container_remove(GTK_CONTAINER(nb_page->m_box), pixmapwid);
nb_page->m_image = -1;
- return TRUE; /* Case 2) */
+ return true; /* Case 2) */
}
}
nb_page->m_image = image;
- return TRUE;
+ return true;
}
void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
if (m_themeEnabled)
- win->SetThemeEnabled(TRUE);
+ win->SetThemeEnabled(true);
GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
/* set the label text */
nb_page->m_text = text;
- if (nb_page->m_text.empty()) nb_page->m_text = wxT("");
+ if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding );
GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer)this );
InvalidateBestSize();
- return TRUE;
+ return true;
}
// helper for HitTest(): check if the point lies inside the given widget which
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;
}
bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
{
- return TRUE;
+ return true;
}
#endif
projects / wxWidgets.git / blobdiff