Mercurial > hg > bitcoin

changeset 406:ace99b7f10f6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'fix-statusbar-color' of https://github.com/mhanne/bitcoin into FIXES
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 20 Jan 2011 14:20:52 -0500
parents aa7ff8175152 (current diff) 329c11e60068 (diff)
children c28ea25997c1
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/uibase.cpp
+++ b/uibase.cpp
@@ -61,7 +61,6 @@
 	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 );
--- a/uiproject.fbp
+++ b/uiproject.fbp
@@ -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>