Correct the name of the XPM file containing the icon in xrc sample.

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 7d0a678acd845e2a67ca10bca73809a0cc0e87af..106e9622b8589f2b8201a7e654b77fbadbde6a2c 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -61,7 +61,7 @@
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #if USE_XPM_BITMAPS
 #endif
 
 #if USE_XPM_BITMAPS


@@ -543,7 +543,7 @@ MyFrame::MyFrame(wxFrame* parent,
 #endif
 
     // Give it an icon
 #endif
 
     // Give it an icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;


@@ -725,8 +725,7 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
 {
     if ( m_tbar )
     {
 {
     if ( m_tbar )
     {

-        delete m_tbar;
-        m_tbar = NULL;
+        wxDELETE(m_tbar);

     }
     else
     {
     }
     else
     {