X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21e02d56c282fb4f078806c46772f412668143b8..a17305ea876e64131467348b24f25929f98986d7:/samples/caret/caret.cpp diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 596fa4b653..483a9ba255 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -27,11 +27,12 @@ #include "wx/numdlg.h" // ---------------------------------------------------------------------------- -// ressources +// resources // ---------------------------------------------------------------------------- + // the application icon -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) - #include "mondrian.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" #endif // ---------------------------------------------------------------------------- @@ -206,7 +207,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { // set the frame icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; @@ -225,7 +226,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); - + m_canvas = new MyCanvas(this); #if wxUSE_STATUSBAR @@ -412,7 +413,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); PrepareDC( dc ); dc.Clear(); - + dc.SetFont( m_font ); for ( int y = 0; y < m_yChars; y++ )