In GetPath(), don't append separator if there's already one at the end

[wxWidgets.git] / samples / widgets / button.cpp

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 29e80d1b9257e99a1da10cce44ceaac955ac92be..c04855340c99ba340391ac3ed4e8f500c862c6b0 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -36,10 +36,11 @@
     #include "wx/textctrl.h"
 #endif
 
+#include "wx/artprov.h"
 #include "wx/sizer.h"
 
 #include "widgets.h"
-#if 1
+
 #include "icons/button.xpm"
 
 // ----------------------------------------------------------------------------
@@ -321,7 +322,7 @@ void ButtonWidgetsPage::CreateButton()
 #ifdef __WXUNIVERSAL__
     if ( m_chkImage->GetValue() )
     {
-        m_button->SetImageLabel(wxTheApp->GetStdIcon(wxICON_INFORMATION));
+        m_button->SetImageLabel(wxArtProvider::GetIcon(wxART_INFORMATION));
     }
 #endif // wxUniv
 
@@ -370,4 +371,3 @@ void ButtonWidgetsPage::OnButton(wxCommandEvent& event)
     wxLogMessage(_T("Test button clicked."));
 }
 
-#endif
\ No newline at end of file