wxHtmlHistoryItem needs not be wxObject

[wxWidgets.git] / contrib / samples / mmedia / mmboard.cpp

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 50e4232047a140e40e4bc9d5ce9ad92967bf77ac..a11274d13c54e2d40d1088b2743c432c655c7c02 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -37,7 +37,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -312,18 +312,18 @@ MMBoardFrame::MMBoardFrame(const wxString& title, const wxPoint& pos, const wxSi
     // Bitmap button panel
     wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
     
     // Bitmap button panel
     wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
     

-    wxBitmap *play_bmp = new wxBitmap(play_back_xpm);
-    wxBitmap *stop_bmp = new wxBitmap(stop_back_xpm);
-    wxBitmap *eject_bmp = new wxBitmap(eject_xpm);
-    wxBitmap *pause_bmp = new wxBitmap(pause_xpm);
+    wxBitmap play_bmp(play_back_xpm);
+    wxBitmap stop_bmp(stop_back_xpm);
+    wxBitmap eject_bmp(eject_xpm);
+    wxBitmap pause_bmp(pause_xpm);

 
 

-    m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, *play_bmp);
+    m_playButton = new wxBitmapButton(m_panel, MMBoard_PlayButton, play_bmp);

     m_playButton->Enable(FALSE);
     m_playButton->Enable(FALSE);

-    m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, *pause_bmp);
+    m_pauseButton = new wxBitmapButton(m_panel, MMBoard_PauseButton, pause_bmp);

     m_pauseButton->Enable(FALSE);
     m_pauseButton->Enable(FALSE);

-    m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, *stop_bmp);
+    m_stopButton = new wxBitmapButton(m_panel, MMBoard_StopButton, stop_bmp);

     m_stopButton->Enable(FALSE);
     m_stopButton->Enable(FALSE);

-    m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, *eject_bmp);
+    m_ejectButton = new wxBitmapButton(m_panel, MMBoard_EjectButton, eject_bmp);

     m_ejectButton->Enable(FALSE);
     
     buttonSizer->Add(m_playButton, 0, wxALL, 2);
     m_ejectButton->Enable(FALSE);
     
     buttonSizer->Add(m_playButton, 0, wxALL, 2);