]> git.saurik.com Git - wxWidgets.git/commitdiff
Use sample icon
authorJulian Smart <julian@anthemion.co.uk>
Fri, 18 Mar 2005 09:44:42 +0000 (09:44 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Fri, 18 Mar 2005 09:44:42 +0000 (09:44 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/font/font.cpp
samples/html/test/test.cpp

index 626a5d8d4e60fb5aad2714a3f6c50c9f65725315..425f0a5fe3e366bb73809872fbdc138435096775 100644 (file)
@@ -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;
 
index d3efde3d9e9e20c719c5c63b69b729396365fde8..b5f9c117bca6e77b0bc4834d0de39197a810c26e 100644 (file)
@@ -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];