Split wxTextCompleter into a base class and wxTextCompleterSimple.

[wxWidgets.git] / samples / widgets / widgets.h

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 7f077cfb5404543d1a5a33e0f47e514412914c1f..d82b03d1bb45b2dc66d03beae7484fc187224d63 100644 (file)
--- 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 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__)
 #endif
 
 #if wxUSE_LOG && !defined(__WXHANDHELD__)


@@ -40,17 +40,19 @@
     #define USE_ICONS_IN_BOOK 0
 #else
     #define USE_ICONS_IN_BOOK 1
     #define USE_ICONS_IN_BOOK 0
 #else
     #define USE_ICONS_IN_BOOK 1

+    #define ICON_SIZE         16

 #endif
 
 #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;
 
 #include "wx/panel.h"
 
 class WidgetsPageInfo;
 
 #include "wx/panel.h"

+#include "wx/vector.h"

 
 // INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories'
 enum
 
 // INTRODUCING NEW PAGES DON'T FORGET TO ADD ENTRIES TO 'WidgetsCategories'
 enum


@@ -82,6 +84,8 @@ enum
     ALL_CTRLS        = 1 << ALL_PAGE
 };
 
     ALL_CTRLS        = 1 << ALL_PAGE
 };
 

+typedef wxVector<wxControl *> Widgets;
+

 // ----------------------------------------------------------------------------
 // WidgetsPage: a book page demonstrating some widget
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // WidgetsPage: a book page demonstrating some widget
 // ----------------------------------------------------------------------------


@@ -91,16 +95,25 @@ class WidgetsPage : public wxPanel
 public:
     WidgetsPage(WidgetsBookCtrl *book,
                 wxImageList *imaglist,
 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
     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;
 
     // lazy creation of the content
     virtual void CreateContent() = 0;
 

-    // some pages show 2 controls, in this case override this one as well
-    virtual wxControl *GetWidget2() const { return NULL; }
+    // some pages show additional controls, in this case override this one to
+    // return all of them (including the one returned by GetWidget())
+    virtual Widgets GetWidgets() const
+    {
+        Widgets widgets;
+        widgets.push_back(GetWidget());
+        return widgets;
+    }

 
     // recreate the control shown by this page
     //
 
     // recreate the control shown by this page
     //