extracted MSW-specific setup.h options to their own wx/msw/setup_inc.h file which...

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

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index ca2a8e7cca83e89bd529bc22102d3cd0f18c84c4..e717e5ad08dc0d9d14087300dd2aa8a0d65a5a2d 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -17,19 +17,17 @@
     #define USE_TREEBOOK 1
     #define WidgetsBookCtrl wxTreebook
     #define WidgetsBookCtrlEvent wxTreebookEvent
     #define USE_TREEBOOK 1
     #define WidgetsBookCtrl wxTreebook
     #define WidgetsBookCtrlEvent wxTreebookEvent

-    #define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_TREEBOOK_PAGE_CHANGED(id,func)
-    #define WidgetBookStyle (wxBK_DEFAULT)
+    #define EVT_WIDGETS_PAGE_CHANGING(id,func) EVT_TREEBOOK_PAGE_CHANGING(id,func)
+    #define wxEVT_COMMAND_WIDGETS_PAGE_CHANGED wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED
+    #define wxWidgetsbookEventHandler(func) wxTreebookEventHandler(func)

 #else
     #include "wx/bookctrl.h"
     #define USE_TREEBOOK 0
     #define WidgetsBookCtrl wxBookCtrl
     #define WidgetsBookCtrlEvent wxBookCtrlEvent
 #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)
-    #ifdef __POCKETPC__
-        #define WidgetBookStyle (wxBK_BOTTOM|wxNB_FLAT)
-    #else
-        #define WidgetBookStyle (wxBK_DEFAULT)
-    #endif
+    #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)

 #endif
 
 #if wxUSE_LOG && !defined(__WXHANDHELD__)
 #endif
 
 #if wxUSE_LOG && !defined(__WXHANDHELD__)


@@ -42,6 +40,7 @@
     #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
 
 class WXDLLEXPORT wxCheckBox;
 #endif
 
 class WXDLLEXPORT wxCheckBox;


@@ -98,6 +97,9 @@ public:
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;
 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 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 2 controls, in this case override this one as well
     virtual wxControl *GetWidget2() const { return NULL; }