do all tests using C++ compiler, this should fix all problems due to testing with...

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

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 30160829e8183a4aef6ce844c9b0d1991972a1f4..d8e40df3ce335321434a164dd80eb83f79b7bcb4 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -13,7 +13,7 @@
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxBookCtrl;
+class WXDLLEXPORT wxBookCtrlBase;

 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 


@@ -37,7 +37,7 @@ class WidgetsPageInfo;
 class WidgetsPage : public wxPanel
 {
 public:
 class WidgetsPage : public wxPanel
 {
 public:

-    WidgetsPage(wxBookCtrl *book);
+    WidgetsPage(wxBookCtrlBase *book);

 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;
 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;


@@ -45,6 +45,14 @@ public:
     // some pages show 2 controls, in this case override this one as well
     virtual wxControl *GetWidget2() const { return NULL; }
 
     // some pages show 2 controls, in this case override this one as well
     virtual wxControl *GetWidget2() const { return NULL; }
 

+    // recreate the control shown by this page
+    //
+    // this is currently used only to take into account the border flags
+    virtual void RecreateWidget() = 0;
+
+    // the default flags for the widget, currently only contains border flags
+    static int ms_defaultFlags;
+

 protected:
     // several helper functions for page creation
 
 protected:
     // several helper functions for page creation
 


@@ -83,7 +91,7 @@ public:
 class WidgetsPageInfo
 {
 public:
 class WidgetsPageInfo
 {
 public:

-    typedef WidgetsPage *(*Constructor)(wxBookCtrl *book,
+    typedef WidgetsPage *(*Constructor)(wxBookCtrlBase *book,

                                         wxImageList *imaglist);
 
     // our ctor
                                         wxImageList *imaglist);
 
     // our ctor


@@ -117,7 +125,7 @@ private:
 
 // and this one must be inserted somewhere in the source file
 #define IMPLEMENT_WIDGETS_PAGE(classname, label)                            \
 
 // and this one must be inserted somewhere in the source file
 #define IMPLEMENT_WIDGETS_PAGE(classname, label)                            \

-    WidgetsPage *wxCtorFor##classname(wxBookCtrl *book,                     \
+    WidgetsPage *wxCtorFor##classname(wxBookCtrlBase *book,                 \

                                       wxImageList *imaglist)                \
         { return new classname(book, imaglist); }                           \
     WidgetsPageInfo classname::                                             \
                                       wxImageList *imaglist)                \
         { return new classname(book, imaglist); }                           \
     WidgetsPageInfo classname::                                             \