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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 595745641485c685654316f3dec337df23ba53d8..210985127df501c24b85e9465a25c50a4feee2a0 100644 (file)
--- a/include/wx/fontmap.h
+++ b/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_

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 1cccec198089ee1684bf88972a2df262a3bbfa3f..7df1437372bf93a48d23aacbaef9f0ee800abf61 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/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
 {

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index ee761165a116c557f584ee47b56964c92a115f7d..dac2949001366dc5f681ef3731f9f137438071dd 100644 (file)
--- a/src/msw/caret.cpp
+++ b/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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index e5c15132894c1f6c38121cc7ed3365e4b0c08a22..ea313873c3e70b26cdc3e8e6fe826236f6190646 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/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