Unicode fixes, wxWidgets coding standards, source cleaning for wxFoldBar samples.

[wxWidgets.git] / contrib / samples / foldbar / foldpanelbar / foldpanelbartest.cpp

diff --git a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
index 62ff6abbedcdb23860236a5cd02a726d260705a2..2a17ea90f560ede0a318ca4f6d32b90ba357f699 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
+++ b/contrib/samples/foldbar/foldpanelbar/foldpanelbartest.cpp
@@ -28,9 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
+#include "sample.xpm"

 
 // ----------------------------------------------------------------------------
 // MyApp Class
 
 // ----------------------------------------------------------------------------
 // MyApp Class


@@ -128,7 +126,7 @@ bool MyApp::OnInit()
 MyAppFrame::MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
        : wxFrame(NULL, wxID_ANY, title, pos, size, style), m_pnl(NULL)
 {
 MyAppFrame::MyAppFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
        : wxFrame(NULL, wxID_ANY, title, pos, size, style), m_pnl(NULL)
 {

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxIcon(sample_xpm));

 
     SetMenuBar(CreateMenuBar());
 
 
     SetMenuBar(CreateMenuBar());