X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2d49353d4ac77775d5c513e55940175458faa1c..ed177375b27f8b80231a42638314c9809e6e945d:/contrib/samples/gizmos/splittree/tree.cpp diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp index 4a7beba3fc..e5aa658f1f 100644 --- a/contrib/samples/gizmos/splittree/tree.cpp +++ b/contrib/samples/gizmos/splittree/tree.cpp @@ -16,10 +16,6 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "tree.cpp" - #pragma interface "tree.cpp" -#endif // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -34,7 +30,7 @@ #include "wx/wx.h" #endif -#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW +#if !defined(__WXMSW__) // || wxUSE_XPM_IN_MSW /* Closed folder */ static char * icon1_xpm[] = { /* width height ncolors chars_per_pixel */ @@ -98,7 +94,7 @@ static char * icon2_xpm[] = { // resources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#ifndef __WXMSW__ #include "mondrian.xpm" #endif @@ -190,7 +186,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) SetIcon(wxICON(mondrian)); // create a menu bar - wxMenu *menuFile = new wxMenu(wxT(""), wxMENU_TEAROFF); + wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF); // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu;