more wxFD_XXX renamings (patch 1488371)

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

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index c1abc26796ba7d1b44dffd38b6228bdcbd9b73a3..ca2a8e7cca83e89bd529bc22102d3cd0f18c84c4 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -18,22 +18,35 @@
     #define WidgetsBookCtrl wxTreebook
     #define WidgetsBookCtrlEvent wxTreebookEvent
     #define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_TREEBOOK_PAGE_CHANGED(id,func)
     #define WidgetsBookCtrl wxTreebook
     #define WidgetsBookCtrlEvent wxTreebookEvent
     #define EVT_WIDGETS_PAGE_CHANGED(id,func) EVT_TREEBOOK_PAGE_CHANGED(id,func)

+    #define WidgetBookStyle (wxBK_DEFAULT)

 #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)
 #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

 #endif
 
 #endif
 

-#if wxUSE_LOG && !defined(__SMARTPHONE__)
+#if wxUSE_LOG && !defined(__WXHANDHELD__)

     #define USE_LOG 1
 #else
     #define USE_LOG 0
 #endif
 
     #define USE_LOG 1
 #else
     #define USE_LOG 0
 #endif
 

+#if defined(__WXHANDHELD__)
+    #define USE_ICONS_IN_BOOK 0
+#else
+    #define USE_ICONS_IN_BOOK 1
+#endif
+

 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxSizer;

+class WXDLLEXPORT wxImageList;

 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT WidgetsBookCtrl;
 
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT WidgetsBookCtrl;
 


@@ -41,9 +54,6 @@ class WidgetsPageInfo;
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-// all source files use wxImageList
-#include "wx/imaglist.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
 {


@@ -81,7 +91,9 @@ enum
 class WidgetsPage : public wxPanel
 {
 public:
 class WidgetsPage : public wxPanel
 {
 public:

-    WidgetsPage(WidgetsBookCtrl *book);
+    WidgetsPage(WidgetsBookCtrl *book,
+                wxImageList *imaglist,
+                char* 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;