#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/sysopt.h"
#include "wx/bookctrl.h"
+#include "wx/treebook.h"
#include "wx/sizer.h"
#include "wx/colordlg.h"
#include "wx/fontdlg.h"
#include "wx/textdlg.h"
+#include "wx/imaglist.h"
+#include "wx/wupdlock.h"
#include "widgets.h"
+#include "../sample.xpm"
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
Widgets_ClearLog = 100,
Widgets_Quit,
+ Widgets_BookCtrl,
+
#if wxUSE_TOOLTIPS
Widgets_SetTooltip,
#endif // wxUSE_TOOLTIPS
Widgets_BorderRaised,
Widgets_BorderSunken,
Widgets_BorderDouble,
- Widgets_BorderDefault
+ Widgets_BorderDefault,
+
+ Widgets_GlobalBusyCursor,
+ Widgets_BusyCursor,
+
+ Widgets_GoToPage,
+ Widgets_GoToPageLast = Widgets_GoToPage + 100,
+
+
+ TextEntry_Begin,
+ TextEntry_DisableAutoComplete = TextEntry_Begin,
+ TextEntry_AutoCompleteFixed,
+ TextEntry_AutoCompleteFilenames,
+ TextEntry_End
+};
+
+const wxChar *WidgetsCategories[MAX_PAGES] = {
+#if defined(__WXUNIVERSAL__)
+ wxT("Universal"),
+#else
+ wxT("Native"),
+#endif
+ wxT("Generic"),
+ wxT("Pickers"),
+ wxT("Comboboxes"),
+ wxT("With items"),
+ wxT("Editable"),
+ wxT("Books"),
+ wxT("All controls")
};
// ----------------------------------------------------------------------------
void OnExit(wxCommandEvent& event);
#if wxUSE_MENUS
+ void OnPageChanging(WidgetsBookCtrlEvent& event);
+ void OnPageChanged(WidgetsBookCtrlEvent& event);
+ void OnGoToPage(wxCommandEvent& event);
+
#if wxUSE_TOOLTIPS
void OnSetTooltip(wxCommandEvent& event);
#endif // wxUSE_TOOLTIPS
void OnSetFont(wxCommandEvent& event);
void OnEnable(wxCommandEvent& event);
void OnSetBorder(wxCommandEvent& event);
+
+ void OnToggleGlobalBusyCursor(wxCommandEvent& event);
+ void OnToggleBusyCursor(wxCommandEvent& event);
+
+ void OnDisableAutoComplete(wxCommandEvent& event);
+ void OnAutoCompleteFixed(wxCommandEvent& event);
+ void OnAutoCompleteFilenames(wxCommandEvent& event);
+
+ void OnUpdateTextUI(wxUpdateUIEvent& event)
+ {
+ event.Enable( CurrentPage()->GetTextEntry() != NULL );
+ }
#endif // wxUSE_MENUS
// initialize the book: add all pages to it
void InitBook();
+ // return the currently selected page (never NULL)
+ WidgetsPage *CurrentPage();
+
private:
// the panel containing everything
wxPanel *m_panel;
#endif // USE_LOG
// the book containing the test pages
- wxBookCtrlBase *m_book;
-
- // and the image list for it
- wxImageList *m_imaglist;
+ WidgetsBookCtrl *m_book;
#if wxUSE_MENUS
// last chosen fg/bg colours and font
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);
EVT_MENU(Widgets_SetTooltip, WidgetsFrame::OnSetTooltip)
#endif // wxUSE_TOOLTIPS
+#if wxUSE_MENUS
+ EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging)
+ EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast,
+ WidgetsFrame::OnGoToPage)
+
EVT_MENU(Widgets_SetFgColour, WidgetsFrame::OnSetFgCol)
EVT_MENU(Widgets_SetBgColour, WidgetsFrame::OnSetBgCol)
EVT_MENU(Widgets_SetFont, WidgetsFrame::OnSetFont)
EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault,
WidgetsFrame::OnSetBorder)
+ EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor)
+ EVT_MENU(Widgets_BusyCursor, WidgetsFrame::OnToggleBusyCursor)
+
+ EVT_MENU(TextEntry_DisableAutoComplete, WidgetsFrame::OnDisableAutoComplete)
+ EVT_MENU(TextEntry_AutoCompleteFixed, WidgetsFrame::OnAutoCompleteFixed)
+ EVT_MENU(TextEntry_AutoCompleteFilenames, WidgetsFrame::OnAutoCompleteFilenames)
+
+ EVT_UPDATE_UI_RANGE(TextEntry_Begin, TextEntry_End - 1,
+ WidgetsFrame::OnUpdateTextUI)
+
EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit)
+#endif // wxUSE_MENUS
END_EVENT_TABLE()
// ============================================================================
title += _T("wxMAC");
#elif defined(__WXMOTIF__)
title += _T("wxMOTIF");
+#elif __WXPALMOS5__
+ title += _T("wxPALMOS5");
+#elif __WXPALMOS6__
+ title += _T("wxPALMOS6");
#else
title += _T("wxWidgets");
#endif
// ----------------------------------------------------------------------------
WidgetsFrame::WidgetsFrame(const wxString& title)
- : wxFrame(NULL, wxID_ANY, title,
- wxPoint(0, 50), 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));
+
// init everything
#if USE_LOG
m_lboxLog = (wxListBox *)NULL;
m_logTarget = (wxLog *)NULL;
#endif // USE_LOG
- m_book = (wxBookCtrlBase *)NULL;
- m_imaglist = (wxImageList *)NULL;
+ m_book = (WidgetsBookCtrl *)NULL;
#if wxUSE_MENUS
// create the menubar
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"));
+
+ wxMenu *menuTextEntry = new wxMenu;
+ menuTextEntry->AppendRadioItem(TextEntry_DisableAutoComplete,
+ _T("&Disable auto-completion"));
+ menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFixed,
+ _T("Fixed-&list auto-completion"));
+ menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFilenames,
+ _T("&Files names auto-completion"));
+
+ mbar->Append(menuTextEntry, _T("&Text"));
+
SetMenuBar(mbar);
mbar->Check(Widgets_Enable, true);
#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|wxBK_DEFAULT;
+ int style = wxBK_DEFAULT;
// Uncomment to suppress page theme (draw in solid colour)
//style |= wxNB_NOPAGETHEME;
- m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition,
+ m_book = new WidgetsBookCtrl(m_panel, Widgets_BookCtrl, wxDefaultPosition,
#ifdef __WXMOTIF__
wxSize(500, wxDefaultCoord), // under Motif, height is a function of the width...
#else
style);
InitBook();
-#ifndef __SMARTPHONE__
+#ifndef __WXHANDHELD__
// the lower one only has the log listbox and a button to clear it
#if USE_LOG
wxSizer *sizerDown = new wxStaticBoxSizer(
sizerTop->Add(0, 5, 0, wxGROW); // spacer in between
sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10);
-#else // !__SMARTPHONE__/__SMARTPHONE__
+#else // !__WXHANDHELD__/__WXHANDHELD__
sizerTop->Add(m_book, 1, wxGROW | wxALL );
-#endif // __SMARTPHONE__
+#endif // __WXHANDHELD__
m_panel->SetSizer(sizerTop);
- sizerTop->Fit(this);
sizerTop->SetSizeHints(this);
#if USE_LOG && !defined(__WXCOCOA__)
void WidgetsFrame::InitBook()
{
- m_imaglist = new wxImageList(32, 32);
+#if USE_ICONS_IN_BOOK
+ wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
- ArrayWidgetsPage pages;
- wxArrayString labels;
+ wxImage img(sample_xpm);
+ imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE)));
+#else
+ wxImageList *imageList = NULL;
+#endif
+
+#if !USE_TREEBOOK
+ WidgetsBookCtrl *books[MAX_PAGES];
+#endif
+
+ ArrayWidgetsPage pages[MAX_PAGES];
+ wxArrayString labels[MAX_PAGES];
+
+ wxMenu *menuPages = new wxMenu;
+ unsigned int nPage = 0, nFKey = 0;
+ int cat, imageId = 1;
// we need to first create all pages and only then add them to the book
// as we need the image list first
- WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
- while ( info )
+ //
+ // we also construct the pages menu during this first iteration
+ for ( cat = 0; cat < MAX_PAGES; cat++ )
{
- WidgetsPage *page = (*info->GetCtor())(m_book, m_imaglist);
- pages.Add(page);
+#if USE_TREEBOOK
+ nPage++; // increase for parent page
+#else
+ books[cat] = new WidgetsBookCtrl(m_book,
+ wxID_ANY,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxBK_DEFAULT);
+#endif
- labels.Add(info->GetLabel());
+ for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages;
+ info;
+ info = info->GetNext() )
+ {
+ if( (info->GetCategories() & ( 1 << cat )) == 0)
+ continue;
+
+ WidgetsPage *page = (*info->GetCtor())(
+#if USE_TREEBOOK
+ m_book
+#else
+ books[cat]
+#endif
+ , imageList);
+ pages[cat].Add(page);
- info = info->GetNext();
+ labels[cat].Add(info->GetLabel());
+ if ( cat == ALL_PAGE )
+ {
+ wxString radioLabel(info->GetLabel());
+ nFKey++;
+ if ( nFKey <= 12 )
+ {
+ radioLabel << wxT("\tF" ) << nFKey;
+ }
+
+ menuPages->AppendRadioItem(
+ Widgets_GoToPage + nPage,
+ radioLabel
+ );
+#if !USE_TREEBOOK
+ // consider only for book in book architecture
+ nPage++;
+#endif
+ }
+
+#if USE_TREEBOOK
+ // consider only for treebook architecture (with subpages)
+ nPage++;
+#endif
+ }
}
- m_book->SetImageList(m_imaglist);
+ GetMenuBar()->Append(menuPages, _T("&Page"));
+
+#if USE_ICONS_IN_BOOK
+ m_book->AssignImageList(imageList);
+#endif
- // now do add them
- size_t count = pages.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ for ( cat = 0; cat < MAX_PAGES; cat++ )
{
- m_book->AddPage(
- pages[n],
- labels[n],
- false, // don't select
- n // image id
- );
-
-/*
- wxColour colour = m_book->MSWGetBgColourForChild(pages[n]);
- pages[n]->SetBackgroundColour(colour);
-*/
+#if USE_TREEBOOK
+ m_book->AddPage(NULL,WidgetsCategories[cat],false,0);
+#else
+ m_book->AddPage(books[cat],WidgetsCategories[cat],false,0);
+#if USE_ICONS_IN_BOOK
+ books[cat]->SetImageList(imageList);
+#endif
+#endif
+
+ // now do add them
+ size_t count = pages[cat].GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+#if USE_TREEBOOK
+ m_book->AddSubPage
+#else
+ books[cat]->AddPage
+#endif
+ (
+ pages[cat][n],
+ labels[cat][n],
+ false, // don't select
+ imageId++
+ );
+ }
}
+
+ Connect( wxID_ANY,
+ wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
+ wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
+
+#if USE_TREEBOOK
+ // 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 // USE_TREEBOOK
+}
+
+WidgetsPage *WidgetsFrame::CurrentPage()
+{
+ 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 USE_LOG
delete m_logTarget;
#endif // USE_LOG
- delete m_imaglist;
}
// ----------------------------------------------------------------------------
#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 + 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();
+}
+
+void WidgetsFrame::OnGoToPage(wxCommandEvent& event)
+{
+#if USE_TREEBOOK
+ m_book->SetSelection(event.GetId() - Widgets_GoToPage);
+#else
+ m_book->SetSelection(m_book->GetPageCount()-1);
+ WidgetsBookCtrl *book = wxStaticCast(m_book->GetCurrentPage(), WidgetsBookCtrl);
+ book->SetSelection(event.GetId() - Widgets_GoToPage);
+#endif
+}
+
#if wxUSE_TOOLTIPS
void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event))
{
static wxString s_tip = _T("This is a tooltip");
- wxString s = wxGetTextFromUser
- (
- _T("Tooltip text: "),
- _T("Widgets sample"),
- s_tip,
- this
- );
+ wxTextEntryDialog dialog
+ (
+ this,
+ _T("Tooltip text (may use \\n, leave empty to remove): "),
+ _T("Widgets sample"),
+ s_tip
+ );
- if ( s.empty() )
+ if ( dialog.ShowModal() != wxID_OK )
return;
- s_tip = s;
+ s_tip = dialog.GetValue();
+ s_tip.Replace(_T("\\n"), _T("\n"));
- if( wxMessageBox( _T("Test multiline tooltip text?"),
- _T("Widgets sample"),
- wxYES_NO,
- this
- ) == wxYES )
- {
- s = _T("#1 ") + s_tip + _T("\n") + _T("#2 ") + s_tip;
- }
+ WidgetsPage *page = CurrentPage();
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
- page->GetWidget()->SetToolTip(s);
+ page->GetWidget()->SetToolTip(s_tip);
wxControl *ctrl2 = page->GetWidget2();
if ( ctrl2 )
- ctrl2->SetToolTip(s);
+ ctrl2->SetToolTip(s_tip);
}
#endif // wxUSE_TOOLTIPS
{
#if wxUSE_COLOURDLG
// allow for debugging the default colour the first time this is called
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+ WidgetsPage *page = CurrentPage();
+
if (!m_colFg.Ok())
m_colFg = page->GetForegroundColour();
void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
{
#if wxUSE_COLOURDLG
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+ WidgetsPage *page = CurrentPage();
+
if ( !m_colBg.Ok() )
m_colBg = page->GetBackgroundColour();
void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event))
{
#if wxUSE_FONTDLG
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+ WidgetsPage *page = CurrentPage();
+
if (!m_font.Ok())
m_font = page->GetFont();
void WidgetsFrame::OnEnable(wxCommandEvent& event)
{
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
- page->GetWidget()->Enable(event.IsChecked());
+ CurrentPage()->GetWidget()->Enable(event.IsChecked());
}
void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
WidgetsPage::ms_defaultFlags &= ~wxBORDER_MASK;
WidgetsPage::ms_defaultFlags |= border;
- WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage);
+ 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));
+}
+
+void WidgetsFrame::OnDisableAutoComplete(wxCommandEvent& WXUNUSED(event))
+{
+ wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
+ wxCHECK_RET( entry, "menu item should be disabled" );
+
+ if ( entry->AutoComplete(wxArrayString()) )
+ wxLogMessage("Disabled auto completion.");
+ else
+ wxLogMessage("AutoComplete() failed.");
+}
+
+void WidgetsFrame::OnAutoCompleteFixed(wxCommandEvent& WXUNUSED(event))
+{
+ wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
+ wxCHECK_RET( entry, "menu item should be disabled" );
+
+ wxArrayString completion_choices;
+
+ // add a few strings so a completion occurs on any letter typed
+ for ( char idxc = 'a'; idxc < 'z'; ++idxc )
+ completion_choices.push_back(wxString::Format("%c%c", idxc, idxc));
+
+ completion_choices.push_back("is this string for test?");
+ completion_choices.push_back("this is a test string");
+ completion_choices.push_back("this is another test string");
+ completion_choices.push_back("this string is for test");
+
+ if ( entry->AutoComplete(completion_choices) )
+ wxLogMessage("Enabled auto completion of a set of fixed strings.");
+ else
+ wxLogMessage("AutoComplete() failed.");
+}
+
+void WidgetsFrame::OnAutoCompleteFilenames(wxCommandEvent& WXUNUSED(event))
+{
+ wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
+ wxCHECK_RET( entry, "menu item should be disabled" );
+
+ if ( entry->AutoCompleteFileNames() )
+ wxLogMessage("Enable auto completion of file names.");
+ else
+ wxLogMessage("AutoCompleteFileNames() failed.");
+}
+
#endif // wxUSE_MENUS
// ----------------------------------------------------------------------------
// WidgetsPageInfo
// ----------------------------------------------------------------------------
-WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label)
+WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label, int categories)
: m_label(label)
+ , m_categories(categories)
{
m_ctor = ctor;
m_next = NULL;
- // dummy sorting: add and immediately sort on list according to label
-
- if(WidgetsPage::ms_widgetPages)
+ // dummy sorting: add and immediately sort in the list according to label
+ if ( WidgetsPage::ms_widgetPages )
{
WidgetsPageInfo *node_prev = WidgetsPage::ms_widgetPages;
- if(wxStrcmp(label,node_prev->GetLabel().c_str())<0)
+ if ( wxStrcmp(label, node_prev->GetLabel().c_str()) < 0 )
{
// add as first
m_next = node_prev;
do
{
node_next = node_prev->GetNext();
- if(node_next)
+ if ( node_next )
{
// add if between two
- if(wxStrcmp(label,node_next->GetLabel().c_str())<0)
+ if ( wxStrcmp(label, node_next->GetLabel().c_str()) < 0 )
{
node_prev->SetNext(this);
m_next = node_next;
m_next = node_next;
}
node_prev = node_next;
- }while(node_next);
+ }
+ while ( node_next );
}
}
else
{
// add when first
-
WidgetsPage::ms_widgetPages = this;
-
}
-
}
// ----------------------------------------------------------------------------
int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT;
WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
-WidgetsPage::WidgetsPage(wxBookCtrlBase *book)
+WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
+ wxImageList *imaglist,
+ const char *const icon[])
: wxPanel(book, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxNO_FULL_REPAINT_ON_RESIZE |
wxCLIP_CHILDREN |
wxTAB_TRAVERSAL)
{
+#if USE_ICONS_IN_BOOK
+ imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE)));
+#else
+ wxUnusedVar(imaglist);
+ wxUnusedVar(icon);
+#endif
}
wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,
projects / wxWidgets.git / blobdiff