From: Julian Smart Date: Fri, 18 Mar 2005 09:44:42 +0000 (+0000) Subject: Use sample icon X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/18922659ebf42fd30c64e42794d9682622915feb Use sample icon git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 626a5d8d4e..425f0a5fe3 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -32,6 +32,8 @@ #include "wx/splitter.h" #include "wx/textfile.h" +#include "../sample.xpm" + #ifdef __WXMAC__ #undef wxFontDialog #include "wx/mac/fontdlg.h" @@ -234,6 +236,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) { m_fontSize = 12; + SetIcon(wxIcon(sample_xpm)); + // create a menu bar wxMenu *menuFile = new wxMenu; diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index d3efde3d9e..b5f9c117bc 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -33,6 +33,8 @@ #include "wx/fs_inet.h" #include "wx/filedlg.h" +#include "../../sample.xpm" + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -188,6 +190,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); + SetIcon(wxIcon(sample_xpm)); + #if wxUSE_ACCEL // Create convenient accelerators for Back and Forward navigation wxAcceleratorEntry entries[2];