diff options
| author | Kandrashin Denis <mail@lintest.ru> | 2009-10-16 22:32:06 +0400 |
|---|---|---|
| committer | Kandrashin Denis <mail@lintest.ru> | 2009-10-16 22:32:06 +0400 |
| commit | a2ef09230a43d587147038693a69dd6985036385 (patch) | |
| tree | bb03e93f8f519e9287966866c517a4abeec49834 | |
| parent | f8a9e085b2306624c3b05771f307067d0d4e3692 (diff) | |
Modify version v0.100.10
| -rw-r--r-- | MyRuLib/FbMainFrame.cpp | 10 | ||||
| -rw-r--r-- | MyRuLib/res/home.xpm (renamed from MyRuLib/desktop/home-32x32.xpm) | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/MyRuLib/FbMainFrame.cpp b/MyRuLib/FbMainFrame.cpp index 9644c786..e0af1752 100644 --- a/MyRuLib/FbMainFrame.cpp +++ b/MyRuLib/FbMainFrame.cpp @@ -73,16 +73,22 @@ FbMainFrame::~FbMainFrame() m_FrameManager.UnInit(); } +#ifndef __WXMSW__ +#include "res/home.xpm" +#endif + bool FbMainFrame::Create(wxWindow * parent, wxWindowID id, const wxString & title) { bool res = wxAuiMDIParentFrame::Create(parent, id, title, wxDefaultPosition, wxSize(700, 500), wxDEFAULT_FRAME_STYLE|wxFRAME_NO_WINDOW_MENU); if(res) { CreateControls(); - #if defined(__WXMSW__) + #ifdef __WXMSW__ wxIcon icon(wxT("aaaa")); SetIcon(icon); #else - wxIcon icon(wxT("/usr/share/myrulib/home_32x32.png")); + wxBitmap bitmap(home_xpm); + wxIcon icon; + icon.CopyFromBitmap(bitmap); SetIcon(icon); #endif } diff --git a/MyRuLib/desktop/home-32x32.xpm b/MyRuLib/res/home.xpm index 4a11d912..79637bd7 100644 --- a/MyRuLib/desktop/home-32x32.xpm +++ b/MyRuLib/res/home.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * home_32x32_xpm[] = { +static const char * home_xpm[] = { "32 32 594 2", " c None", ". c #A4492E", |