Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / samples / menu / menu.cpp

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 4c3b8dc902eab59f958cdbc67ba49341dcd751fe..e3b11060a21b5b7ef0f4f9b0df1b6c44ad2983dc 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -41,7 +41,7 @@
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't

-#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__)
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__)

     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1
     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1


@@ -55,11 +55,9 @@
     #define USE_LOG_WINDOW 0
 #endif
 
     #define USE_LOG_WINDOW 0
 #endif
 

-#if wxUSE_OWNER_DRAWN || defined(__WXGTK__)

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

-#endif

 
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -466,9 +464,7 @@ MyFrame::MyFrame()
 #if USE_LOG_WINDOW
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       wxT("Clear &log\tCtrl-L"));
 #if USE_LOG_WINDOW
     wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
                                       wxT("Clear &log\tCtrl-L"));

-#if wxUSE_OWNER_DRAWN || defined(__WXGTK__)

     item->SetBitmap(copy_xpm);
     item->SetBitmap(copy_xpm);

-#endif

     fileMenu->Append(item);
     fileMenu->AppendSeparator();
 #endif // USE_LOG_WINDOW
     fileMenu->Append(item);
     fileMenu->AppendSeparator();
 #endif // USE_LOG_WINDOW