#include "wx/log.h"
#include "wx/frame.h"
#include "wx/menu.h"
+ #include "wx/image.h"
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/fontdlg.h"
#include "wx/textdlg.h"
#include "wx/imaglist.h"
+#include "wx/wupdlock.h"
#include "widgets.h"
Widgets_BorderDouble,
Widgets_BorderDefault,
+ Widgets_GlobalBusyCursor,
+ Widgets_BusyCursor,
+
Widgets_GoToPage,
Widgets_GoToPageLast = Widgets_GoToPage + 100
};
void OnExit(wxCommandEvent& event);
#if wxUSE_MENUS
+ void OnPageChanging(WidgetsBookCtrlEvent& event);
void OnPageChanged(WidgetsBookCtrlEvent& event);
void OnGoToPage(wxCommandEvent& event);
void OnSetFont(wxCommandEvent& event);
void OnEnable(wxCommandEvent& event);
void OnSetBorder(wxCommandEvent& event);
+
+ void OnToggleGlobalBusyCursor(wxCommandEvent& event);
+ void OnToggleBusyCursor(wxCommandEvent& event);
#endif // wxUSE_MENUS
// 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)
EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
WidgetsFrame::OnSetBorder)
+ EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor)
+ EVT_MENU(Widgets_BusyCursor, WidgetsFrame::OnToggleBusyCursor)
+
EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
#endif // wxUSE_MENUS
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
WidgetsFrame::WidgetsFrame(const wxString& title)
- : wxFrame(NULL, wxID_ANY, title,
- wxDefaultPosition, wxDefaultSize,
- wxDEFAULT_FRAME_STYLE |
- wxNO_FULL_REPAINT_ON_RESIZE |
- wxCLIP_CHILDREN |
- wxTAB_TRAVERSAL)
+ : wxFrame(NULL, wxID_ANY, title)
{
// set the frame icon
SetIcon(wxICON(sample));
menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5"));
menuWidget->AppendSubMenu(menuBorders, _T("Set &border"));
+ menuWidget->AppendSeparator();
+ menuWidget->AppendCheckItem(Widgets_GlobalBusyCursor,
+ _T("Toggle &global busy cursor\tCtrl-Shift-U"));
+ menuWidget->AppendCheckItem(Widgets_BusyCursor,
+ _T("Toggle b&usy cursor\tCtrl-U"));
+
menuWidget->AppendSeparator();
menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q"));
mbar->Append(menuWidget, _T("&Widget"));
#endif // wxUSE_MENUS
// create controls
- m_panel = new wxPanel(this, wxID_ANY,
- wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN);
+ m_panel = new wxPanel(this, wxID_ANY);
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
// we have 2 panes: book with pages demonstrating the controls in the
// upper one and the log window with some buttons in the lower
- int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|WidgetBookStyle;
+ int style = wxBK_DEFAULT;
// Uncomment to suppress page theme (draw in solid colour)
//style |= wxNB_NOPAGETHEME;
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
wxID_ANY,
wxDefaultPosition,
wxDefaultSize,
- WidgetBookStyle);
+ wxBK_DEFAULT);
#endif
for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
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()
{
-#if USE_TREEBOOK
- return wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
-#else
- WidgetsBookCtrl *book = wxStaticCast(m_book->GetCurrentPage(), WidgetsBookCtrl);
- if (!book) return NULL;
- return wxStaticCast(book->GetCurrentPage(), WidgetsPage);
-#endif
+ wxWindow *page = m_book->GetCurrentPage();
+
+#if !USE_TREEBOOK
+ WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl);
+ wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") );
+
+ page = subBook->GetCurrentPage();
+#endif // !USE_TREEBOOK
+
+ return wxStaticCast(page, WidgetsPage);
}
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)
{
- wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection());
- if (item) item->Check();
+ const int sel = event.GetSelection();
+
+ // adjust "Page" menu selection
+ wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + sel);
+ if ( item )
+ item->Check();
+
+ GetMenuBar()->Check(Widgets_BusyCursor, false);
+
+ // 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 )
+ {
+ size.IncTo(page->GetSize());
+ }
+ }
+ page->SetSize(size);
+ }
+
event.Skip();
}
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 (!m_colFg.Ok())
m_colFg = page->GetForegroundColour();
{
#if wxUSE_COLOURDLG
WidgetsPage *page = CurrentPage();
+
if ( !m_colBg.Ok() )
m_colBg = page->GetBackgroundColour();
{
#if wxUSE_FONTDLG
WidgetsPage *page = CurrentPage();
+
if (!m_font.Ok())
m_font = page->GetFont();
void WidgetsFrame::OnEnable(wxCommandEvent& event)
{
- WidgetsPage *page = CurrentPage();
- page->GetWidget()->Enable(event.IsChecked());
+ CurrentPage()->GetWidget()->Enable(event.IsChecked());
}
void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
WidgetsPage::ms_defaultFlags |= border;
WidgetsPage *page = CurrentPage();
+
page->RecreateWidget();
}
+void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event)
+{
+ if ( event.IsChecked() )
+ wxBeginBusyCursor();
+ else
+ wxEndBusyCursor();
+}
+
+void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event)
+{
+ CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked()
+ ? wxHOURGLASS_CURSOR
+ : wxSTANDARD_CURSOR));
+}
+
#endif // wxUSE_MENUS
// ----------------------------------------------------------------------------
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