Remove unnecessary mondrian.{ico,xpm} files from samples directory.
Standardize on using sample.rc and sample icon in all the samples, it was confusing that some of them used it and other didn't, without any apparent logic. Remove the now unnecessary icon files, including the dialogs sample icon which seemed to be corrupted (this closes #11146). Also replace multiple OS/2 resource files with a single one in the sample directory. The OS/2 projects/makefiles would need to be updated to use them. Remove dialogs sample icon. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,8 +51,8 @@
|
||||
|
||||
#include "printing.h"
|
||||
|
||||
#ifndef __WXMSW__
|
||||
#include "mondrian.xpm"
|
||||
#if !defined(__WXMSW__) && !defined(__WXPM__)
|
||||
#include "../sample.xpm"
|
||||
#endif
|
||||
|
||||
// Global print data, to remember settings during the session
|
||||
@@ -212,7 +212,7 @@ void MyApp::Draw(wxDC&dc)
|
||||
str.Printf( wxT("---- Text at angle %d ----"), i );
|
||||
dc.DrawRotatedText( str, 100, 300, i );
|
||||
|
||||
wxIcon my_icon = wxICON(mondrian);
|
||||
wxIcon my_icon = wxICON(sample);
|
||||
|
||||
dc.DrawIcon( my_icon, 100, 100);
|
||||
|
||||
@@ -303,7 +303,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, const wxPoint&pos, const
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
// Load icon and bitmap
|
||||
SetIcon( wxICON( mondrian) );
|
||||
SetIcon( wxICON( sample) );
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
Reference in New Issue
Block a user