Rearranged widgets sample to show more and categorized widgets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,10 +12,30 @@
|
||||
#ifndef _WX_SAMPLE_WIDGETS_H_
|
||||
#define _WX_SAMPLE_WIDGETS_H_
|
||||
|
||||
#if wxUSE_TREEBOOK
|
||||
#include "wx/treebook.h"
|
||||
#define USE_TREEBOOK 1
|
||||
#define WidgetsBookCtrl wxTreebook
|
||||
#define WidgetsBookCtrlEvent wxTreebookEvent
|
||||
#define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_TREEBOOK_PAGE_CHANGED(id,func)
|
||||
#else
|
||||
#include "wx/bookctrl.h"
|
||||
#define USE_TREEBOOK 0
|
||||
#define WidgetsBookCtrl wxBookCtrl
|
||||
#define WidgetsBookCtrlEvent wxBookCtrlEvent
|
||||
#define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_BOOKCTRL_PAGE_CHANGED(id,func)
|
||||
#endif
|
||||
|
||||
#if wxUSE_LOG && !defined(__SMARTPHONE__)
|
||||
#define USE_LOG 1
|
||||
#else
|
||||
#define USE_LOG 0
|
||||
#endif
|
||||
|
||||
class WXDLLEXPORT wxCheckBox;
|
||||
class WXDLLEXPORT wxBookCtrlBase;
|
||||
class WXDLLEXPORT wxSizer;
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
class WXDLLEXPORT WidgetsBookCtrl;
|
||||
|
||||
class WidgetsPageInfo;
|
||||
|
||||
@@ -24,11 +44,31 @@ class WidgetsPageInfo;
|
||||
// all source files use wxImageList
|
||||
#include "wx/imaglist.h"
|
||||
|
||||
#if wxUSE_LOG && !defined(__SMARTPHONE__)
|
||||
#define USE_LOG 1
|
||||
#else
|
||||
#define USE_LOG 0
|
||||
#endif
|
||||
// INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories'
|
||||
enum
|
||||
{
|
||||
NATIVE_PAGE = 0,
|
||||
GENERIC_PAGE,
|
||||
PICKER_PAGE,
|
||||
COMBO_PAGE,
|
||||
WITH_ITEMS_PAGE,
|
||||
EDITABLE_PAGE,
|
||||
BOOK_PAGE,
|
||||
ALL_PAGE,
|
||||
MAX_PAGES
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
NATIVE_CTRLS = 1 << NATIVE_PAGE,
|
||||
GENERIC_CTRLS = 1 << GENERIC_PAGE,
|
||||
PICKER_CTRLS = 1 << PICKER_PAGE,
|
||||
COMBO_CTRLS = 1 << COMBO_PAGE,
|
||||
WITH_ITEMS_CTRLS = 1 << WITH_ITEMS_PAGE,
|
||||
EDITABLE_CTRLS = 1 << EDITABLE_PAGE,
|
||||
BOOK_CTRLS = 1 << BOOK_PAGE,
|
||||
ALL_CTRLS = 1 << ALL_PAGE
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// WidgetsPage: a book page demonstrating some widget
|
||||
@@ -37,7 +77,7 @@ class WidgetsPageInfo;
|
||||
class WidgetsPage : public wxPanel
|
||||
{
|
||||
public:
|
||||
WidgetsPage(wxBookCtrlBase *book);
|
||||
WidgetsPage(WidgetsBookCtrl *book);
|
||||
|
||||
// return the control shown by this page
|
||||
virtual wxControl *GetWidget() const = 0;
|
||||
@@ -91,14 +131,15 @@ public:
|
||||
class WidgetsPageInfo
|
||||
{
|
||||
public:
|
||||
typedef WidgetsPage *(*Constructor)(wxBookCtrlBase *book,
|
||||
typedef WidgetsPage *(*Constructor)(WidgetsBookCtrl *book,
|
||||
wxImageList *imaglist);
|
||||
|
||||
// our ctor
|
||||
WidgetsPageInfo(Constructor ctor, const wxChar *label);
|
||||
WidgetsPageInfo(Constructor ctor, const wxChar *label, int categories);
|
||||
|
||||
// accessors
|
||||
const wxString& GetLabel() const { return m_label; }
|
||||
int GetCategories() const { return m_categories; }
|
||||
Constructor GetCtor() const { return m_ctor; }
|
||||
WidgetsPageInfo *GetNext() const { return m_next; }
|
||||
|
||||
@@ -108,6 +149,9 @@ private:
|
||||
// the label of the page
|
||||
wxString m_label;
|
||||
|
||||
// the list (flags) for sharing page between categories
|
||||
int m_categories;
|
||||
|
||||
// the function to create this page
|
||||
Constructor m_ctor;
|
||||
|
||||
@@ -124,11 +168,11 @@ private:
|
||||
{ return &ms_info##classname; }
|
||||
|
||||
// and this one must be inserted somewhere in the source file
|
||||
#define IMPLEMENT_WIDGETS_PAGE(classname, label) \
|
||||
WidgetsPage *wxCtorFor##classname(wxBookCtrlBase *book, \
|
||||
#define IMPLEMENT_WIDGETS_PAGE(classname, label, categories) \
|
||||
WidgetsPage *wxCtorFor##classname(WidgetsBookCtrl *book, \
|
||||
wxImageList *imaglist) \
|
||||
{ return new classname(book, imaglist); } \
|
||||
WidgetsPageInfo classname:: \
|
||||
ms_info##classname(wxCtorFor##classname, label)
|
||||
ms_info##classname(wxCtorFor##classname, label, ALL_CTRLS | categories)
|
||||
|
||||
#endif // _WX_SAMPLE_WIDGETS_H_
|
||||
|
Reference in New Issue
Block a user