AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosemtic fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-02-05 01:55:54 +00:00
parent f603012fbb
commit 85401ffe5c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
samples/statbar/statbar.cpp
View File

@ -39,7 +39,6 @@
#include "wx/app.h"
#include "wx/frame.h"
#include "wx/statusbr.h"
#include "wx/datetime.h"
#include "wx/timer.h"
#include "wx/checkbox.h"
#include "wx/statbmp.h"
@ -47,6 +46,8 @@
#include "wx/msgdlg.h"
#endif
#include "wx/datetime.h"
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
@ -315,6 +316,11 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
// MyStatusBar
// ----------------------------------------------------------------------------
#ifdef __VISUALC__
// 'this' : used in base member initializer list -- so what??
#pragma warning(disable: 4355)
#endif
MyStatusBar::MyStatusBar(wxWindow *parent)
: wxStatusBar(parent, -1), m_timer(this)
{
@ -326,13 +332,19 @@ MyStatusBar::MyStatusBar(wxWindow *parent)
m_checkbox = new wxCheckBox(this, StatusBar_Checkbox, _T("&Toggle clock"));
m_checkbox->SetValue(TRUE);
m_statbmp = new wxStaticBitmap(this, -1, wxICON(green));
m_statbmp = new wxStaticBitmap(this, -1, wxIcon(green_xpm));
m_timer.Start(1000);
SetMinHeight(BITMAP_SIZE_Y);
UpdateClock();
}
#ifdef __VISUALC__
#pragma warning(default: 4355)
#endif
MyStatusBar::~MyStatusBar()
{
if ( m_timer.IsRunning() )
@ -361,7 +373,7 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& event)
{
m_timer.Start(1000);
m_statbmp->SetIcon(wxICON(green));
m_statbmp->SetIcon(wxIcon(green_xpm));
UpdateClock();
}
@ -369,7 +381,7 @@ void MyStatusBar::OnToggleClock(wxCommandEvent& event)
{
m_timer.Stop();
m_statbmp->SetIcon(wxICON(red));
m_statbmp->SetIcon(wxIcon(red_xpm));
SetStatusText("", Field_Clock);
}