diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-01-20 14:20:52 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-01-20 14:20:52 -0500 |
| commit | 415535e47be437cd89d70f31e499d2522e6dbeca (patch) | |
| tree | 5a197e8c564f67d5491214c717f045c5f705dd53 | |
| parent | 3475caf8f5eb207ae0b239f989c6c8c73ce03af0 (diff) | |
| parent | ed4e8830d71308f827aa9cc93323aa788c33fb47 (diff) | |
| download | bitcoin-415535e47be437cd89d70f31e499d2522e6dbeca.tar.xz | |
Merge branch 'fix-statusbar-color' of https://github.com/mhanne/bitcoin into FIXES
| -rw-r--r-- | uibase.cpp | 1 | ||||
| -rw-r--r-- | uiproject.fbp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/uibase.cpp b/uibase.cpp index 9fe98993ed..a421e776e3 100644 --- a/uibase.cpp +++ b/uibase.cpp @@ -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 ); diff --git a/uiproject.fbp b/uiproject.fbp index f3f9dc9fd0..bf01732ea8 100644 --- 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>
|