From: Włodzimierz Skiba Date: Fri, 19 May 2006 10:17:43 +0000 (+0000) Subject: Tinderbox build fix: preprocessing directive not recognized within macro arg. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d8a731eed4ac51dd1b3fd26d43ccf681465e3018 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 58c55fa2d5..805126fef1 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -154,20 +154,20 @@ END_EVENT_TABLE() // implementation // ============================================================================ -IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), #if defined(__WXUNIVERSAL__) - UNIVERSAL_CTRLS + #define FAMILY_CTRLS UNIVERSAL_CTRLS #elif defined(__WXMSW__) || \ defined(__WXMOTIF__) || \ defined(__WXGTK__) || \ defined(__WXMAC__) || \ defined(__WXPM__) || \ defined(__WXPALMOS__) - NATIVE_CTRLS + #define FAMILY_CTRLS NATIVE_CTRLS #else - GENERIC_CTRLS + #define FAMILY_CTRLS GENERIC_CTRLS #endif - ); + +IMPLEMENT_WIDGETS_PAGE(ButtonWidgetsPage, _T("Button"), FAMILY_CTRLS ); ButtonWidgetsPage::ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist)