HP-UX compilation errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 30e48fca4453ae08abad3359aadbaae48b624be6..aee24ca764e350f9b132b8d3740996e4b8ea0502 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -158,8 +158,8 @@ public:
     // ctor starts the stop watch
     wxStopWatch()        { Start(); }
     void Start(long t = 0);
     // ctor starts the stop watch
     wxStopWatch()        { Start(); }
     void Start(long t = 0);

-    inline void Pause()  { m_pause = GetElapsedTime(); }
-    inline void Resume() { Start(m_pause); }
+    void Pause()  { m_pause = GetElapsedTime(); }
+    void Resume() { Start(m_pause); }

 
     // get elapsed time since the last Start() or Pause() in milliseconds
     long Time() const;
 
     // get elapsed time since the last Start() or Pause() in milliseconds
     long Time() const;

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index a26d420e68825c2bdcca6adf71a7c8b9f5e60c79..f6b77360a9b5dc054f7a1394f1890e97124f43a9 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -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();
 }

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5a6e892e78bcb2a0b9c9c6b0eb8a73f8277850e4..60b582dcfb475e9c4a96e89a6dca7bc1718bb74d 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -688,12 +688,12 @@ void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
     item.m_mask = wxLIST_MASK_DATA;
 
     item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
     item.m_mask = wxLIST_MASK_DATA;
 
     item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );

-    while ( item.m_itemId != -1 ) 
+    while ( item.m_itemId != -1 )

     {
         GetItem( item );
         wxFileData *fd = (wxFileData*)item.m_data;
         delete fd;
     {
         GetItem( item );
         wxFileData *fd = (wxFileData*)item.m_data;
         delete fd;

-        item.m_data = (void*) NULL;
+        item.m_data = 0;

         SetItem( item );
         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
         SetItem( item );
         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_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     item.m_mask = wxLIST_MASK_TEXT;
 
     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 );
         paths.Add( dir + item.m_text );
     {
         m_list->GetItem( item );
         paths.Add( dir + item.m_text );


@@ -1194,7 +1194,7 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     item.m_mask = wxLIST_MASK_TEXT;
 
     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 );
         files.Add( item.m_text );
     {
         m_list->GetItem( item );
         files.Add( item.m_text );