Tinderbox build fix: preprocessing directive not recognized within macro arg.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 58c55fa2d59443d0c63bb81c2dae7b1599dd063d..805126fef1d2637f669538bf8ed658597456b308 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -154,20 +154,20 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"),

 #if defined(__WXUNIVERSAL__)
 #if defined(__WXUNIVERSAL__)

-                       UNIVERSAL_CTRLS
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS

 #elif defined(__WXMSW__)    || \
       defined(__WXMOTIF__)  || \
       defined(__WXGTK__)    || \
       defined(__WXMAC__)    || \
       defined(__WXPM__)     || \
       defined(__WXPALMOS__)
 #elif defined(__WXMSW__)    || \
       defined(__WXMOTIF__)  || \
       defined(__WXGTK__)    || \
       defined(__WXMAC__)    || \
       defined(__WXPM__)     || \
       defined(__WXPALMOS__)

-                       NATIVE_CTRLS
+    #define FAMILY_CTRLS NATIVE_CTRLS

 #else
 #else

-                       GENERIC_CTRLS
+    #define FAMILY_CTRLS GENERIC_CTRLS

 #endif
 #endif

-                       );
+
+IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), FAMILY_CTRLS );

 
 ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
                                      wxImageList *imaglist)
 
 ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book,
                                      wxImageList *imaglist)