Fixed 'Custom' entry in the colour property combo boxes

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

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index fd01886676235cdfe5d30aa3e2f58f5fdba4a828..f4820fb1d1739da2aa53d447c1218945f45dce32 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -59,6 +59,10 @@
 #include "copy.xpm"
 #endif
 
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
@@ -371,6 +375,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame()
        : wxFrame((wxFrame *)NULL, wxID_ANY, _T("wxWidgets menu sample"))
 {
+    SetIcon(wxICON(sample));
+
 #if USE_LOG_WINDOW
     m_textctrl = NULL;
 #endif
@@ -674,7 +680,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     (void)wxMessageBox(_T("wxWidgets menu sample\n(c) 1999-2001 Vadim Zeitlin"),
                        _T("About wxWidgets menu sample"),
-                       wxICON_INFORMATION);
+                       wxOK | wxICON_INFORMATION);
 }
 
 void MyFrame::OnDeleteMenu(wxCommandEvent& WXUNUSED(event))