first pass of wxUniv merge - nothing works, most parts don't even compile

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

include/wx/fontdlg.h

@@ -1,6 +1,8 @@
 #ifndef _WX_FONTDLG_H_BASE_
 #define _WX_FONTDLG_H_BASE_
 
+#if wxUSE_FONTDLG
+
 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
 #elif defined(__WXMOTIF__)
@@ -25,5 +27,7 @@
 #   define sm_classwxFontDialog sm_classwxGenericFontDialog
 #endif
 
+#endif // wxUSE_FONTDLG
+
 #endif
     // _WX_FONTDLG_H_BASE_