// Created: 26/10/98
// RCS-ID: $Id$
// Copyright: (c) 1998-2002 wxWidgets team
-// License: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "../sample.xpm"
#endif
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
IMPLEMENT_APP(MyApp)
bool MyApp::OnInit()
return true;
}
+
+//-----------------------------------------------------------------------------
+// Creation functions
+//-----------------------------------------------------------------------------
+
wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent)
{
wxPanel *panel = new wxPanel(parent);
#endif
(void) new wxButton( panel, wxID_ANY, wxT("Button"),
- wxPoint(10, 10), wxDefaultSize );
+ wxPoint(10, 10), wxDefaultSize );
return panel;
}
panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) );
#endif
- wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
+ wxString animals[] =
+ { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
wxT("Sabre-toothed tiger"), wxT("T Rex") };
wxRadioBox *radiobox1 = new wxRadioBox(panel, wxID_ANY, wxT("Choose one"),
wxDefaultPosition, wxDefaultSize, 5, animals, 2, wxRA_SPECIFY_ROWS);
- wxString computers[] = { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
+ wxString computers[] =
+ { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
wxT("Another") };
wxRadioBox *radiobox2 = new wxRadioBox(panel, wxID_ANY,
#endif
(void) new wxStaticText( panel, wxID_ANY,
- wxT("This page intentionally left blank"), wxPoint(10, 10) );
+ wxT("This page intentionally left blank"),
+ wxPoint(10, 10) );
return panel;
}
return panel;
}
-
wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
{
wxPanel *panel = new wxPanel(parent);
panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
(void) new wxStaticText( panel, wxID_ANY,
- wxT("This page has been inserted, not added."), wxPoint(10, 10) );
+ wxT("This page has been inserted, not added."),
+ wxPoint(10, 10) );
return panel;
}
if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME )
return CreateBigButtonPage(parent);
- wxFAIL_MSG( _T("unknown page name") );
+ wxFAIL_MSG( wxT("unknown page name") );
return NULL;
}
+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+ // File menu
+ EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType)
+ EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient)
+ EVT_MENU(ID_SHOW_IMAGES, MyFrame::OnShowImages)
+ EVT_MENU_RANGE(ID_FIXEDWIDTH, ID_HORZ_LAYOUT, MyFrame::OnStyle)
+ EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+
+ // Operations menu
+ EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage)
+ EVT_MENU(ID_ADD_PAGE_NO_SELECT, MyFrame::OnAddPageNoSelect)
+ EVT_MENU(ID_INSERT_PAGE, MyFrame::OnInsertPage)
+ EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage)
+ EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage)
+ EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
+ EVT_MENU(ID_CHANGE_SELECTION, MyFrame::OnChangeSelection)
+ EVT_MENU(ID_SET_SELECTION, MyFrame::OnSetSelection)
+
+#if wxUSE_HELP
+ EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp)
+#endif // wxUSE_HELP
+ EVT_MENU(ID_HITTEST, MyFrame::OnHitTest)
+
+ // Book controls
+#if wxUSE_NOTEBOOK
+ EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook)
+ EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook)
+#endif
+#if wxUSE_LISTBOOK
+ EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook)
+ EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook)
+#endif
+#if wxUSE_CHOICEBOOK
+ EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnChoicebook)
+ EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnChoicebook)
+#endif
+#if wxUSE_TREEBOOK
+ EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook)
+ EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook)
+
+ EVT_MENU(ID_ADD_SUB_PAGE, MyFrame::OnAddSubPage)
+ EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore)
+ EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE,
+ MyFrame::OnUpdateTreeMenu)
+#endif
+#if wxUSE_TOOLBOOK
+ EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook)
+ EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook)
+#endif
+
+ // Update title in idle time
+ EVT_IDLE(MyFrame::OnIdle)
+END_EVENT_TABLE()
+
MyFrame::MyFrame()
: wxFrame(NULL, wxID_ANY, wxString(wxT("wxWidgets book controls sample")))
{
m_type = Type_Listbook;
#elif wxUSE_TREEBOOK
m_type = Type_Treebook;
-#elif
+#elif wxUSE_TOOLBOOK
+ m_type = Type_Toolbook;
+#else
#error "Don't use Notebook sample without any book enabled in wxWidgets build!"
#endif
m_orient = ID_ORIENT_DEFAULT;
m_chkShowImages = true;
+ m_fixedWidth = false;
m_multi = false;
+ m_noPageTheme = false;
+ m_buttonBar = false;
+ m_horzLayout = false;
SetIcon(wxICON(sample));
menuType->Check(ID_BOOK_NOTEBOOK + m_type, true);
wxMenu *menuOrient = new wxMenu;
- menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tCtrl-5"));
- menuOrient->AppendRadioItem(ID_ORIENT_TOP, wxT("&Top\tCtrl-6"));
- menuOrient->AppendRadioItem(ID_ORIENT_BOTTOM, wxT("&Bottom\tCtrl-7"));
- menuOrient->AppendRadioItem(ID_ORIENT_LEFT, wxT("&Left\tCtrl-8"));
- menuOrient->AppendRadioItem(ID_ORIENT_RIGHT, wxT("&Right\tCtrl-9"));
+ menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tAlt-0"));
+ menuOrient->AppendRadioItem(ID_ORIENT_TOP, wxT("&Top\tAlt-1"));
+ menuOrient->AppendRadioItem(ID_ORIENT_BOTTOM, wxT("&Bottom\tAlt-2"));
+ menuOrient->AppendRadioItem(ID_ORIENT_LEFT, wxT("&Left\tAlt-3"));
+ menuOrient->AppendRadioItem(ID_ORIENT_RIGHT, wxT("&Right\tAlt-4"));
+
+ wxMenu *menuStyle = new wxMenu;
+#if wxUSE_NOTEBOOK
+ menuStyle->AppendCheckItem(ID_FIXEDWIDTH, wxT("&Fixed Width (wxNotebook)"));
+ menuStyle->AppendCheckItem(ID_MULTI, wxT("&Multiple lines (wxNotebook)"));
+ menuStyle->AppendCheckItem(ID_NOPAGETHEME, wxT("&No Page Theme (wxNotebook)"));
+#endif
+#if wxUSE_TOOLBOOK
+ menuStyle->AppendCheckItem(ID_BUTTONBAR, wxT("&Button Bar (wxToolbook)"));
+ menuStyle->AppendCheckItem(ID_HORZ_LAYOUT, wxT("&Horizontal layout (wxToolbook)"));
+#endif
wxMenu *menuPageOperations = new wxMenu;
menuPageOperations->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A"));
menuPageOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U"));
#endif
menuPageOperations->AppendSeparator();
- menuPageOperations->Append(ID_GO_HOME, wxT("Go to the first page\tCtrl-F"));
+ menuPageOperations->Append(ID_CHANGE_SELECTION, wxT("&Change selection to 0\tCtrl-0"));
+ menuPageOperations->Append(ID_SET_SELECTION, wxT("&Set selection to 0\tShift-Ctrl-0"));
wxMenu *menuOperations = new wxMenu;
#if wxUSE_HELP
menuFile->Append(wxID_ANY, wxT("&Type"), menuType, wxT("Type of control"));
menuFile->Append(wxID_ANY, wxT("&Orientation"), menuOrient, wxT("Orientation of control"));
menuFile->AppendCheckItem(ID_SHOW_IMAGES, wxT("&Show images\tAlt-S"));
- menuFile->AppendCheckItem(ID_MULTI, wxT("&Multiple lines\tAlt-M"));
+ menuFile->Append(wxID_ANY, wxT("&Style"), menuStyle, wxT("Style of control"));
menuFile->AppendSeparator();
menuFile->Append(wxID_EXIT, wxT("E&xit"), wxT("Quits the application"));
menuFile->Check(ID_SHOW_IMAGES, m_chkShowImages);
- menuFile->Check(ID_MULTI, m_multi);
wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, wxT("&File"));
RecreateBook();
m_panel->SetSizer(m_sizerFrame);
+ m_panel->Layout();
- m_sizerFrame->SetSizeHints(this);
-
- Centre(wxBOTH);
+ wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(m_panel, wxSizerFlags(1).Expand());
+ SetSizerAndFit(sizer);
}
MyFrame::~MyFrame()
#define CASE_TOOLBOOK(x)
#endif
-#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after) \
+#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after) \
switch ( m_type ) \
{ \
CASE_NOTEBOOK(before nb after) \
CASE_LISTBOOK(before lb after) \
CASE_CHOICEBOOK(before cb after) \
CASE_TREEBOOK(before tb after) \
- CASE_TOOLBOOK(before toolb after) \
+ CASE_TOOLBOOK(before toolb after) \
\
default: \
- wxFAIL_MSG( _T("unknown book control type") ); \
+ wxFAIL_MSG( wxT("unknown book control type") ); \
}
int MyFrame::TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const
flags = wxBK_DEFAULT;
}
+#if wxUSE_NOTEBOOK
+ if ( m_fixedWidth && m_type == Type_Notebook )
+ flags |= wxNB_FIXEDWIDTH;
if ( m_multi && m_type == Type_Notebook )
flags |= wxNB_MULTILINE;
+ if ( m_noPageTheme && m_type == Type_Notebook )
+ flags |= wxNB_NOPAGETHEME;
+#endif
+#if wxUSE_TOOLBOOK
+ if ( m_buttonBar && m_type == Type_Toolbook )
+ flags |= wxTBK_BUTTONBAR;
+ if ( m_horzLayout && m_type == Type_Toolbook )
+ flags |= wxTBK_HORZ_LAYOUT;
+#endif
wxBookCtrlBase *oldBook = m_bookCtrl;
m_bookCtrl->Hide();
- if ( m_chkShowImages )
+ // wxToolbook doesn't work without icons so always use them for it.
+ if ( m_chkShowImages || m_type == Type_Toolbook )
{
m_bookCtrl->SetImageList(m_imageList);
}
m_sizerFrame->Layout();
}
-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
- // File menu
- EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType)
- EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient)
- EVT_MENU(ID_SHOW_IMAGES, MyFrame::OnShowImages)
- EVT_MENU(ID_MULTI, MyFrame::OnMulti)
- EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
+ const wxChar * flagName) const
+{
+ if( (flags & flag) == flag )
+ {
+ if( !flagStr.empty() )
+ flagStr += wxT(" | ");
+ flagStr += flagName;
+ }
+}
- // Operations menu
- EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage)
- EVT_MENU(ID_ADD_PAGE_NO_SELECT, MyFrame::OnAddPageNoSelect)
- EVT_MENU(ID_INSERT_PAGE, MyFrame::OnInsertPage)
- EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage)
- EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage)
- EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
- EVT_MENU(ID_GO_HOME, MyFrame::OnGoHome)
+wxPanel *MyFrame::CreateNewPage() const
+{
+ wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY );
#if wxUSE_HELP
- EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp)
-#endif // wxUSE_HELP
- EVT_MENU(ID_HITTEST, MyFrame::OnHitTest)
-
- // Book controls
-#if wxUSE_NOTEBOOK
- EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook)
- EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook)
-#endif
-#if wxUSE_LISTBOOK
- EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook)
- EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook)
-#endif
-#if wxUSE_CHOICEBOOK
- EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnChoicebook)
- EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnChoicebook)
+ panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) );
#endif
-#if wxUSE_TREEBOOK
- EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook)
- EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook)
- EVT_MENU(ID_ADD_SUB_PAGE, MyFrame::OnAddSubPage)
- EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore)
- EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE,
- MyFrame::OnUpdateTreeMenu)
-#endif
-#if wxUSE_TOOLBOOK
- EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook)
- EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook)
-#endif
+ (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 30));
+ (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(150, 30));
- // Update title in idle time
- EVT_IDLE(MyFrame::OnIdle)
-END_EVENT_TABLE()
+ return panel;
+}
+
+
+//-----------------------------------------------------------------------------
+// MyFrame - event handlers
+//-----------------------------------------------------------------------------
#if wxUSE_HELP
#endif // wxUSE_HELP
-void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const
-{
- if( (flags & flag) == flag )
- {
- if( !flagStr.empty() )
- flagStr += _T(" | ");
- flagStr += flagName;
- }
-}
-
void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase * book = GetCurrentBook();
wxString flagsStr;
- AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_NOWHERE, _T("wxBK_HITTEST_NOWHERE") );
- AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONICON, _T("wxBK_HITTEST_ONICON") );
- AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONLABEL, _T("wxBK_HITTEST_ONLABEL") );
- AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONPAGE, _T("wxBK_HITTEST_ONPAGE") );
+ AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_NOWHERE, wxT("wxBK_HITTEST_NOWHERE") );
+ AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONICON, wxT("wxBK_HITTEST_ONICON") );
+ AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONLABEL, wxT("wxBK_HITTEST_ONLABEL") );
+ AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONPAGE, wxT("wxBK_HITTEST_ONPAGE") );
wxLogMessage(wxT("HitTest at (%d,%d): %d: %s"),
pt.x,
#endif // wxUSE_TREEBOOK
-
void MyFrame::OnOrient(wxCommandEvent& event)
{
m_orient = event.GetId();
m_sizerFrame->Layout();
}
-void MyFrame::OnMulti(wxCommandEvent& event)
+void MyFrame::OnStyle(wxCommandEvent& event)
{
- m_multi = event.IsChecked();
+ bool checked = event.IsChecked();
+ switch (event.GetId())
+ {
+ case ID_FIXEDWIDTH: m_fixedWidth = checked; break;
+ case ID_MULTI: m_multi = checked; break;
+ case ID_NOPAGETHEME: m_noPageTheme = checked; break;
+ case ID_BUTTONBAR: m_buttonBar = checked; break;
+ case ID_HORZ_LAYOUT: m_horzLayout = checked; break;
+ default: break; // avoid compiler warning
+ }
+
RecreateBook();
m_sizerFrame->Layout();
- wxLogMessage(_T("Multiline setting works only in wxNotebook."));
}
void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
Close();
}
-wxPanel *MyFrame::CreateNewPage() const
-{
- wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY );
-
-#if wxUSE_HELP
- panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) );
-#endif
-
- (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 10));
- (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(50, 100));
-
- return panel;
-}
-
void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase *currBook = GetCurrentBook();
const int selPos = currBook->GetSelection();
if ( selPos == wxNOT_FOUND )
{
- wxLogError(_T("Select the parent page first!"));
+ wxLogError(wxT("Select the parent page first!"));
return;
}
const int selPos = currBook->GetSelection();
if ( selPos == wxNOT_FOUND )
{
- wxLogError(_T("Select the parent page first!"));
+ wxLogError(wxT("Select the parent page first!"));
return;
}
}
}
-void MyFrame::OnGoHome(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnChangeSelection(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase *currBook = GetCurrentBook();
if ( currBook )
- {
- // ChangeSelection shouldn't send any events, SetSelection() should
currBook->ChangeSelection(0);
- //currBook->SetSelection(0);
- }
+}
+
+void MyFrame::OnSetSelection(wxCommandEvent& WXUNUSED(event))
+{
+ wxBookCtrlBase *currBook = GetCurrentBook();
+
+ if ( currBook )
+ currBook->SetSelection(0);
}
void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
{
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
- _T("wxNotebook")
+ wxT("wxNotebook")
},
#endif // wxUSE_NOTEBOOK
#if wxUSE_LISTBOOK
{
wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,
wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,
- _T("wxListbook")
+ wxT("wxListbook")
},
#endif // wxUSE_LISTBOOK
#if wxUSE_CHOICEBOOK
{
wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,
wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,
- _T("wxChoicebook")
+ wxT("wxChoicebook")
},
#endif // wxUSE_CHOICEBOOK
#if wxUSE_TREEBOOK
{
wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,
wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,
- _T("wxTreebook")
+ wxT("wxTreebook")
},
#endif // wxUSE_TREEBOOK
#if wxUSE_TOOLBOOK
{
wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,
wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING,
- _T("wxToolbook")
+ wxT("wxToolbook")
},
#endif // wxUSE_TOOLBOOK
};
nameControl,
veto;
const wxEventType eventType = event.GetEventType();
+
+ // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
+ // wxRTTI
+ const wxBookCtrlBase * const
+ book = static_cast<wxBookCtrlBase *>(event.GetEventObject());
+
for ( size_t n = 0; n < WXSIZEOF(events); n++ )
{
const EventInfo& ei = events[n];
{
const int idx = event.GetOldSelection();
- // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
- // wxRTTI
- const wxBookCtrlBase * const
- book = static_cast<wxBookCtrlBase *>(event.GetEventObject());
if ( idx != wxNOT_FOUND &&
book && book->GetPageText(idx) == VETO_PAGE_NAME )
{
) != wxYES )
{
event.Veto();
- veto = _T(" (vetoed)");
+ veto = wxT(" (vetoed)");
}
}
static int s_num = 0;
- wxLogMessage(wxT("Event #%d: %s: %s (%d) new sel %d, old %d%s"),
+ wxLogMessage(wxT("Event #%d: %s: %s (%d) new sel %d, old %d, current %d%s"),
++s_num,
nameControl.c_str(),
nameEvent.c_str(),
eventType,
event.GetSelection(),
event.GetOldSelection(),
+ book->GetSelection(),
veto.c_str());
#if USE_LOG
projects / wxWidgets.git / blobdiff