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

HP-UX compilation errors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-02-08 16:28:55 +00:00
parent ad2522ad3f
commit 92da8bde1b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/timer.h
View File

@ -158,8 +158,8 @@ public:
// ctor starts the stop watch // ctor starts the stop watch
wxStopWatch() { Start(); } wxStopWatch() { Start(); }
void Start(long t = 0); void Start(long t = 0);
inline void Pause() { m_pause = GetElapsedTime(); } void Pause() { m_pause = GetElapsedTime(); }
inline void Resume() { Start(m_pause); } void Resume() { Start(m_pause); }
// get elapsed time since the last Start() or Pause() in milliseconds // get elapsed time since the last Start() or Pause() in milliseconds
long Time() const; long Time() const;

2
src/common/timercmn.cpp
View File

@ -113,7 +113,7 @@ void wxStopWatch::Start(long t)
m_pause = 0; m_pause = 0;
} }
inline long wxStopWatch::GetElapsedTime() const long wxStopWatch::GetElapsedTime() const
{ {
return (wxGetLocalTimeMillis() - m_t0).GetLo(); return (wxGetLocalTimeMillis() - m_t0).GetLo();
} }

8
src/generic/filedlgg.cpp
View File

@ -688,12 +688,12 @@ void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
item.m_mask = wxLIST_MASK_DATA; item.m_mask = wxLIST_MASK_DATA;
item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL ); item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
while ( item.m_itemId != -1 ) while ( item.m_itemId != -1 )
{ {
GetItem( item ); GetItem( item );
wxFileData *fd = (wxFileData*)item.m_data; wxFileData *fd = (wxFileData*)item.m_data;
delete fd; delete fd;
item.m_data = (void*) NULL; item.m_data = 0;
SetItem( item ); SetItem( item );
item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL ); item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
} }
@ -1171,7 +1171,7 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
item.m_mask = wxLIST_MASK_TEXT; item.m_mask = wxLIST_MASK_TEXT;
item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
while ( item.m_itemId != -1 ) while ( item.m_itemId != -1 )
{ {
m_list->GetItem( item ); m_list->GetItem( item );
paths.Add( dir + item.m_text ); paths.Add( dir + item.m_text );
@ -1194,7 +1194,7 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
item.m_mask = wxLIST_MASK_TEXT; item.m_mask = wxLIST_MASK_TEXT;
item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
while ( item.m_itemId != -1 ) while ( item.m_itemId != -1 )
{ {
m_list->GetItem( item ); m_list->GetItem( item );
files.Add( item.m_text ); files.Add( item.m_text );