Fix wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event type name.

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

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index de0654b1dc8a74738a98f83319e40de75ec16a83..79014bd54309f88461e0a6444e8501e795157146 100644 (file)
--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@@ -40,7 +40,7 @@
 
 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -137,7 +137,7 @@ bool MyApp::OnInit()
         bitmap = wxBitmap(mobile_xpm);
 
     bool ok = frame->m_isPda
-            ? bitmap.Ok()
+            ? bitmap.IsOk()
             : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);
 
     if (ok)
@@ -182,7 +182,7 @@ MyFrame::MyFrame(const wxString& title)
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(wxID_ABOUT, wxT("&About...\tF1"), wxT("Show about frame"));
+    helpMenu->Append(wxID_ABOUT, wxT("&About\tF1"), wxT("Show about frame"));
 
     menuFile->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
 
@@ -218,7 +218,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     if (m_isPda) bitmap = wxBitmap(mobile_xpm);
 
     bool ok = m_isPda
-            ? bitmap.Ok()
+            ? bitmap.IsOk()
             : bitmap.LoadFile(wxT("splash.png"), wxBITMAP_TYPE_PNG);
 
     if (ok)