Merge branch 'fix-statusbar-color' of https://github.com/mhanne/bitcoin into FIXES

This commit is contained in:
Gavin Andresen 2011-01-20 14:20:52 -05:00
commit 415535e47b
2 changed files with 1 additions and 2 deletions

View file

@ -61,7 +61,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
m_toolBar->Realize();
m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
m_statusBar->SetBackgroundColour( wxColour( 240, 240, 240 ) );
wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxVERTICAL );

View file

@ -282,7 +282,7 @@
</object>
</object>
<object class="wxStatusBar" expanded="1">
<property name="bg">240,240,240</property>
<property name="bg"></property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>