#include "wx/log.h"
#include "wx/frame.h"
#include "wx/menu.h"
+ #include "wx/image.h"
#include "wx/button.h"
#include "wx/checkbox.h"
void OnExit(wxCommandEvent& event);
#if wxUSE_MENUS
+ void OnPageChanging(WidgetsBookCtrlEvent& event);
void OnPageChanged(WidgetsBookCtrlEvent& event);
void OnGoToPage(wxCommandEvent& event);
// initialize the book: add all pages to it
void InitBook();
- // finding current page assuming book inside book
+ // return the currently selected page (never NULL)
WidgetsPage *CurrentPage();
private:
private:
// implement sink functions
- virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+ virtual void DoLog(wxLogLevel level, const wxString& str, time_t t)
{
// don't put trace messages into listbox or we can get into infinite
// recursion
if ( m_logOld )
{
// cast is needed to call protected method
- ((LboxLogger *)m_logOld)->DoLog(level, szString, t);
+ ((LboxLogger *)m_logOld)->DoLog(level, str, t);
}
}
else
{
- wxLog::DoLog(level, szString, t);
+ wxLog::DoLog(level, str, t);
}
}
- virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+ virtual void DoLogString(const wxString& str, time_t WXUNUSED(t))
{
wxString msg;
TimeStamp(&msg);
- msg += szString;
+ msg += str;
#ifdef __WXUNIVERSAL__
m_lbox->AppendAndEnsureVisible(msg);
#endif // wxUSE_TOOLTIPS
#if wxUSE_MENUS
- EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged)
+ EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)
EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
WidgetsFrame::OnGoToPage)
title += _T("wxMAC");
#elif defined(__WXMOTIF__)
title += _T("wxMOTIF");
+#elif __WXPALMOS5__
+ title += _T("wxPALMOS5");
+#elif __WXPALMOS6__
+ title += _T("wxPALMOS6");
#else
title += _T("wxWidgets");
#endif
m_panel->SetSizer(sizerTop);
- sizerTop->Fit(this);
sizerTop->SetSizeHints(this);
#if USE_LOG && !defined(__WXCOCOA__)
void WidgetsFrame::InitBook()
{
#if USE_ICONS_IN_BOOK
- wxImageList *imageList = new wxImageList(32, 32);
+ wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
- imageList->Add(wxBitmap(sample_xpm));
+ wxImage img(sample_xpm);
+ imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE)));
#else
wxImageList *imageList = NULL;
#endif
for ( size_t n = 0; n < count; n++ )
{
#if USE_TREEBOOK
- m_book->AddSubPage(
+ m_book->AddSubPage
#else
- books[cat]->AddPage(
+ books[cat]->AddPage
#endif
+ (
pages[cat][n],
labels[cat][n],
false, // don't select
}
}
+ Connect( wxID_ANY,
+ wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
+ wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
+
#if USE_TREEBOOK
- // for treebook page #0 is empty parent page only
+ // for treebook page #0 is empty parent page only so select the first page
+ // with some contents
+ m_book->SetSelection(1);
+
+ // but ensure that the top of the tree is shown nevertheless
+ wxTreeCtrl * const tree = m_book->GetTreeCtrl();
+
+ wxTreeItemIdValue cookie;
+ tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie));
+#else
+ // for other books set selection twice to force connected event handler
+ // to force lazy creation of initial visible content
m_book->SetSelection(1);
m_book->SetSelection(0);
-#endif
+#endif // USE_TREEBOOK
}
WidgetsPage *WidgetsFrame::CurrentPage()
{
wxWindow *page = m_book->GetCurrentPage();
- if(!page) return NULL;
-#if USE_TREEBOOK
- return wxStaticCast(page, WidgetsPage);
-#else
+#if !USE_TREEBOOK
WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl);
- if (!subBook) return NULL;
+ wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") );
+
page = subBook->GetCurrentPage();
- if(!page) return NULL;
+#endif // !USE_TREEBOOK
+
return wxStaticCast(page, WidgetsPage);
-#endif
}
WidgetsFrame::~WidgetsFrame()
#if wxUSE_MENUS
+void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event)
+{
+#if USE_TREEBOOK
+ // don't allow selection of entries without pages (categories)
+ if ( !m_book->GetPage(event.GetSelection()) )
+ event.Veto();
+#else
+ wxUnusedVar(event);
+#endif
+}
+
void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
{
+ const int sel = event.GetSelection();
+
// adjust "Page" menu selection
- wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection());
- if (item) item->Check();
+ wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + sel);
+ if ( item )
+ item->Check();
+
+ GetMenuBar()->Check(Widgets_BusyCursor, false);
- // lazy creation of the pages
- WidgetsPage* page = CurrentPage();
- if (page && (page->GetChildren().GetCount()==0))
+ // create the pages on demand, otherwise the sample startup is too slow as
+ // it creates hundreds of controls
+ WidgetsPage *page = CurrentPage();
+ if ( page->GetChildren().empty() )
{
wxWindowUpdateLocker noUpdates(page);
page->CreateContent();
+ //page->Layout();
+ page->GetSizer()->Fit(page);
+
WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl);
wxSize size;
for ( size_t i = 0; i < book->GetPageCount(); ++i )
{
wxWindow *page = book->GetPage(i);
- if (page)
+ if ( page )
{
size.IncTo(page->GetSize());
}
void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
{
- WidgetsPage *page = CurrentPage();
-
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
-
static wxString s_tip = _T("This is a tooltip");
wxTextEntryDialog dialog
s_tip = dialog.GetValue();
s_tip.Replace(_T("\\n"), _T("\n"));
+ WidgetsPage *page = CurrentPage();
+
page->GetWidget()->SetToolTip(s_tip);
wxControl *ctrl2 = page->GetWidget2();
#if wxUSE_COLOURDLG
// allow for debugging the default colour the first time this is called
WidgetsPage *page = CurrentPage();
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
if (!m_colFg.Ok())
m_colFg = page->GetForegroundColour();
{
#if wxUSE_COLOURDLG
WidgetsPage *page = CurrentPage();
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
if ( !m_colBg.Ok() )
m_colBg = page->GetBackgroundColour();
{
#if wxUSE_FONTDLG
WidgetsPage *page = CurrentPage();
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
if (!m_font.Ok())
m_font = page->GetFont();
void WidgetsFrame::OnEnable(wxCommandEvent& event)
{
- WidgetsPage *page = CurrentPage();
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
-
- page->GetWidget()->Enable(event.IsChecked());
+ CurrentPage()->GetWidget()->Enable(event.IsChecked());
}
void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
WidgetsPage *page = CurrentPage();
- if(!page)
- {
- wxLogMessage(_T("Page not selected."));
- return;
- }
-
page->RecreateWidget();
}
void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
{
- WidgetsPage *page = CurrentPage();
- page->GetWidget()->SetCursor(*(event.IsChecked() ? wxHOURGLASS_CURSOR
- : wxSTANDARD_CURSOR));
+ CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked()
+ ? wxHOURGLASS_CURSOR
+ : wxSTANDARD_CURSOR));
}
#endif // wxUSE_MENUS
WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
wxImageList *imaglist,
- char* icon[])
+ const char *const icon[])
: wxPanel(book, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE |
wxTAB_TRAVERSAL)
{
#if USE_ICONS_IN_BOOK
- imaglist->Add(wxBitmap(icon));
+ imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE)));
#else
wxUnusedVar(imaglist);
wxUnusedVar(icon);
projects / wxWidgets.git / blobdiff