Remove duplicate IMPLEMENT_DYNAMIC_CLASS() for wxGtkCalendarCtrl.

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 7d0a678acd845e2a67ca10bca73809a0cc0e87af..180ac7ccd468ff621ee2843ef0967a9357ff5f49 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


@@ -315,8 +315,6 @@ bool MyApp::OnInit()
 
     wxInitAllImageHandlers();
 
 
     wxInitAllImageHandlers();
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 


@@ -543,7 +541,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;


@@ -642,7 +640,7 @@ MyFrame::MyFrame(wxFrame* parent,
     m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP);
     PopulateToolbar(m_extraToolBar);
 #endif
     m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP);
     PopulateToolbar(m_extraToolBar);
 #endif

-    
+

     m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
 
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
     m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
 
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);


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

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

     }
     else
     {
     }
     else
     {