Extract compiler-specific macro definitions in a new wx/compiler.h.

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index c3364c7a0a8c2496cf9b59936097ff427e3808ab..3247e32e2d401f8096c2a728d9d98d9fd38c886e 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,7 +36,7 @@
 
 #include "dragimag.h"
 
 
 #include "dragimag.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

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


@@ -318,7 +318,7 @@ MyFrame::MyFrame()
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();
           wxPoint(20,20), wxSize(470,360) )
 {
     wxMenu *file_menu = new wxMenu();

-    file_menu->Append( wxID_ABOUT, wxT("&About..."));
+    file_menu->Append( wxID_ABOUT, wxT("&About"));

     file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
     file_menu->Append( wxID_EXIT, wxT("E&xit"));
 
     file_menu->AppendCheckItem( TEST_USE_SCREEN, wxT("&Use whole screen for dragging"), wxT("Use whole screen"));
     file_menu->Append( wxID_EXIT, wxT("E&xit"));