Warning fixes.

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 9ca61d396414e654b247746a6d5ea8089f80a476..203fe373037bdc28ae8adf85826af058f441f9d1 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -37,11 +37,12 @@
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"

-
+#if wxUSE_DRAG_AND_DROP

     #include "dnd_copy.xpm"
     #include "dnd_move.xpm"
     #include "dnd_none.xpm"
 #endif
     #include "dnd_copy.xpm"
     #include "dnd_move.xpm"
     #include "dnd_none.xpm"
 #endif

+#endif

 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 7d043f321e782686394b65d095ae491b30e06789..3665eebae16f837e3473ab5e182d72bc967ed0c6 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -55,7 +55,9 @@
     #define USE_LOG_WINDOW 0
 #endif
 
     #define USE_LOG_WINDOW 0
 #endif
 

+#if wxUSE_OWNER_DRAWN

 #include "copy.xpm"
 #include "copy.xpm"

+#endif

 
 // ----------------------------------------------------------------------------
 // classes
 
 // ----------------------------------------------------------------------------
 // classes