X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cebbfc2bd3a22ee50f789fca623d9037660e495..de1610c87a4f3b17758c7bbcb927be347be062f8:/samples/widgets/widgets.h diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h index 7f077cfb54..2420bbe567 100644 --- a/samples/widgets/widgets.h +++ b/samples/widgets/widgets.h @@ -27,7 +27,7 @@ #define WidgetsBookCtrlEvent wxBookCtrlEvent #define EVT_WIDGETS_PAGE_CHANGING(id,func) EVT_BOOKCTRL_PAGE_CHANGING(id,func) #define wxEVT_COMMAND_WIDGETS_PAGE_CHANGED wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED - #define wxWidgetsbookEventHandler(func) wxBookctrlEventHandler(func) + #define wxWidgetsbookEventHandler(func) wxBookCtrlEventHandler(func) #endif #if wxUSE_LOG && !defined(__WXHANDHELD__) @@ -40,13 +40,14 @@ #define USE_ICONS_IN_BOOK 0 #else #define USE_ICONS_IN_BOOK 1 + #define ICON_SIZE 16 #endif -class WXDLLEXPORT wxCheckBox; -class WXDLLEXPORT wxSizer; -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT WidgetsBookCtrl; +class WXDLLIMPEXP_FWD_CORE wxCheckBox; +class WXDLLIMPEXP_FWD_CORE wxSizer; +class WXDLLIMPEXP_FWD_CORE wxImageList; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE WidgetsBookCtrl; class WidgetsPageInfo; @@ -91,11 +92,14 @@ class WidgetsPage : public wxPanel public: WidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, - char* icon[]); + const char *const icon[]); // return the control shown by this page virtual wxControl *GetWidget() const = 0; + // return the control shown by this page, if it supports text entry interface + virtual wxTextEntryBase *GetTextEntry() const { return NULL; } + // lazy creation of the content virtual void CreateContent() = 0;