missing #if's needed for compilation with some wxUSE_XXX set to 0 (patch 728413)

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

include/wx/fontmap.h

@@ -200,6 +200,13 @@ private:
 // do NOT use! This is for backward compatibility, use wxFontMapper::Get() instead
 #define wxTheFontMapper (wxFontMapper::Get())
 
-#endif // wxUSE_FONTMAP
+#else // !wxUSE_FONTMAP
+
+#if wxUSE_GUI
+    // wxEncodingToCodepage (utils.cpp) needs wxGetNativeFontEncoding
+    #include "wx/fontenc.h"
+#endif
+
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 
 #endif // _WX_FONTMAPPER_H_

src/msw/bitmap.cpp

@@ -1090,11 +1090,13 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 // wxBitmap accessors
 // ----------------------------------------------------------------------------
 
+#if wxUSE_PALETTE
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
                            : (wxPalette *) NULL;
 }
+#endif
 
 wxMask *wxBitmap::GetMask() const
 {

src/msw/caret.cpp

@@ -35,6 +35,8 @@
 
 #include "wx/caret.h"
 
+#if wxUSE_CARET
+
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
@@ -192,3 +194,5 @@ void wxCaret::DoSize()
         OnSetFocus();
     }
 }
+
+#endif

src/msw/colordlg.cpp

@@ -42,6 +42,8 @@
     #include "wx/msgdlg.h"
 #endif
 
+#if wxUSE_COLOURDLG
+
 #include <windows.h>
 
 #if !defined(__WIN32__) || defined(__SALFORDC__)
@@ -226,3 +228,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
         *height = 299;
 }
 
+#endif