Compilation fix

[wxWidgets.git] / include / wx / msw / ole / activex.h

diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h
index 49bae1ce86ebe09da637ce991ae4b2b508095496..31a9eb2a4c2e5a16ed023511ccaf01213f419c82 100644 (file)
--- a/include/wx/msw/ole/activex.h
+++ b/include/wx/msw/ole/activex.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/activex.h
+// Name:        wx/msw/ole/activex.h

 // Purpose:     wxActiveXContainer class
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Purpose:     wxActiveXContainer class
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:


@@ -196,24 +196,24 @@ public:
     virtual wxEvent *Clone() const
     { return new wxActiveXEvent(*this); }
 
     virtual wxEvent *Clone() const
     { return new wxActiveXEvent(*this); }
 

-    int ParamCount() const
+    size_t ParamCount() const

     {   return m_params.GetCount();  }
 
     {   return m_params.GetCount();  }
 

-    wxString ParamType(int idx) const
+    wxString ParamType(size_t idx) const

     {
     {

-        wxASSERT(idx >= 0 && idx < m_params.GetCount());
+        wxASSERT(idx < m_params.GetCount());

         return m_params[idx].GetType();
     }
 
         return m_params[idx].GetType();
     }
 

-    wxString ParamName(int idx) const
+    wxString ParamName(size_t idx) const

     {
     {

-        wxASSERT(idx >= 0 && idx < m_params.GetCount());
+        wxASSERT(idx < m_params.GetCount());

         return m_params[idx].GetName();
     }
 
         return m_params[idx].GetName();
     }
 

-    wxVariant& operator[] (int idx)
+    wxVariant& operator[] (size_t idx)

     {
     {

-        wxASSERT(idx >= 0 && idx < ParamCount());
+        wxASSERT(idx < ParamCount());

         return m_params[idx];
     }
 
         return m_params[idx];
     }
 


@@ -229,4 +229,3 @@ typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActiveXEventFunction, &func)
 
 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActiveXEventFunction, &func)
 
 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_

-