Applied patch #15286: documentation and col/rowspan demo by dghart

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

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 1016c703922cec051d933b45de16d280078be09d..8477103b8b1c5cda4434ade27aabbc5dac6b555d 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -36,7 +36,7 @@
 
 
 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -213,7 +213,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(Display_About, _("&About...\tF1"), _("Show about dialog"));
+    helpMenu->Append(Display_About, _("&About\tF1"), _("Show about dialog"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();