--- wxCpuThrottle/src/wxcputhrottleframe.cpp 2007/08/08 21:00:34 20 +++ wxCpuThrottle/src/wxcputhrottleframe.cpp 2007/08/09 17:14:40 21 @@ -20,15 +20,18 @@ #include "wxcputhrottleframe.h" +#include "SysMetrix.xpm" + BEGIN_EVENT_TABLE( wxCpuThrottleFrame, wxDialog ) EVT_CLOSE( wxCpuThrottleFrame::OnClose ) END_EVENT_TABLE() wxCpuThrottleFrame::wxCpuThrottleFrame( const wxString& title, const wxPoint& pos, const wxSize& size ) - : wxDialog((wxDialog *)NULL, -1, title, pos, size) - //mTrayIcon(this) -{ + : wxDialog((wxDialog *)NULL, -1, title, pos, size), + mIcon(SysMetrix_xpm) +{ + SetIcon(mIcon); mTrayIcon = new TrayIcon(this); mTrayIcon->SetIcon(mIcon,wxT("wxCpuThrottle") ); } @@ -36,6 +39,8 @@ void wxCpuThrottleFrame::OnQuit( wxCommandEvent& WXUNUSED( event ) ) { delete mTrayIcon; + mTrayIcon = 0; + Close(TRUE); wxExit(); @@ -46,4 +51,10 @@ Show(false); } - +void wxCpuThrottleFrame::SetPosition() +{ + const int freeBorder = 20; + wxSize screenSize = ::wxGetDisplaySize(); + wxSize mySize = GetSize(); + Move(screenSize.GetWidth()-mySize.GetWidth() - freeBorder, screenSize.GetHeight() - mySize.GetHeight() - freeBorder); +}