uint -> size_t change

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index f511a98087bd14949bb5701ffeea5c0f20559bac..163291f121c51e55c200e5711eeef2aa41f504da 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -16,7 +16,7 @@
 #pragma interface "checklst.h"
 #endif
 
-typedef   unsigned int  uint;
+typedef   unsigned int  size_t;
 
 #if !USE_OWNER_DRAWN
   #error  "wxCheckListBox class requires owner-drawn functionality."
@@ -41,16 +41,16 @@ public:
 //                 const wxFont& font = wxNullFont);
 
   // items may be checked
-  bool  IsChecked(uint uiIndex) const;
-  void  Check(uint uiIndex, bool bCheck = TRUE);
+  bool  IsChecked(size_t uiIndex) const;
+  void  Check(size_t uiIndex, bool bCheck = TRUE);
 
   // accessors
-  uint  GetItemHeight() const { return m_nItemHeight; }
+  size_t  GetItemHeight() const { return m_nItemHeight; }
 
 protected:
   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions
-  virtual wxOwnerDrawn *CreateItem(uint n);
+  virtual wxOwnerDrawn *CreateItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   // pressing space or clicking the check box toggles the item
@@ -58,7 +58,7 @@ protected:
   void OnLeftClick(wxMouseEvent& event);
 
 private:
-  uint    m_nItemHeight;  // height of checklistbox items (the same for all)
+  size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h
index 126eb39076a9e6978b110ff67b57e9184c13509b..3d3ba318861daf3a582899866eab841475f8a10f 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -58,7 +58,7 @@ class WXDLLEXPORT wxPaintDC: public wxDC
 
  protected:
     static WXHDC ms_PaintHDC;
-    static uint  ms_PaintCount;
+    static size_t  ms_PaintCount;
 };
 
 #endif

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index c8d2544d658923f98ba50ade1219ab25a411db12..d67a8cf886f3630ab3a9c70ed223363014051c11 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -55,8 +55,8 @@ public:
   virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
   virtual bool GetNextEntry (wxString& str, long& lIndex) const;
 
-  virtual uint GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual uint GetNumberOfGroups(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
 
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index d8cf809003e4d44e763ec398ac1b0c55f3e3302d..b11df5edd389fcf9488bb8b7cca16a68313a0aff 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -68,10 +68,10 @@ class WXDLLEXPORT wxListBox: public wxControl
   bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
   // plug-in for derived classes
-  virtual wxOwnerDrawn *CreateItem(uint n);
+  virtual wxOwnerDrawn *CreateItem(size_t n);
 
   // allows to get the item and use SetXXX functions to set it's appearance
-  wxOwnerDrawn *GetItem(uint n) const { return m_aItems[n]; }
+  wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; }
 #endif
 
   virtual void Append(const wxString& item);

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index 245c4db718768950b059a145a6a391a39e12e652..0f952805d1cdf9d79e6a0d8e47a98d3c99b5ac25 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -65,7 +65,7 @@ public:
     // StdFormat enumerations or a user-defined format)
   virtual bool IsSupportedFormat(wxDataFormat format) const = 0;
     // get the (total) size of data
-  virtual uint GetDataSize() const = 0;
+  virtual size_t GetDataSize() const = 0;
     // copy raw data to provided pointer
   virtual void GetDataHere(void *pBuf) const = 0;
 
@@ -93,7 +93,7 @@ public:
     { return (wxDataFormat) wxDataObject::Text; }
   virtual bool IsSupportedFormat(wxDataFormat format) const
     { return format == wxDataObject::Text || format == wxDataObject::Locale; }
-  virtual uint GetDataSize() const
+  virtual size_t GetDataSize() const
     { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
   virtual void GetDataHere(void *pBuf) const
     { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 5f74de0751d907b7c7e454866ce9c367e19489e8..700501f87131d83a2bccf89cea7bcc6e81def650 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -53,8 +53,8 @@ public:
 
     // get number of entries/subgroups in the current group, with or without
     // it's subgroups
-  virtual uint GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual uint GetNumberOfGroups(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
 
   // read/write
   virtual bool Read(wxString *pStr, const char *szKey,

diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h
index 02b49182e6760d0486b928d87b85c0eb71ec91e3..4452ba9d944f7767facf5a6d00e54bf13565a23a 100644 (file)
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -83,9 +83,9 @@ public:
     // number of standard keys
   static const size_t nStdKeys;
     // get the name of a standard key
-  static const char *GetStdKeyName(uint key);
+  static const char *GetStdKeyName(size_t key);
     // get the short name of a standard key
-  static const char *GetStdKeyShortName(uint key);
+  static const char *GetStdKeyShortName(size_t key);
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(HKEY hkey);
 
@@ -123,10 +123,10 @@ public:
     // get the info about key (any number of these pointers may be NULL)
 
 #ifdef __GNUWIN32__
-  bool  GetKeyInfo(uint *pnSubKeys,      // number of subkeys
-                   uint *pnMaxKeyLen,    // max len of subkey name
-                   uint *pnValues,       // number of values
-                   uint *pnMaxValueLen) const;
+  bool  GetKeyInfo(size_t *pnSubKeys,      // number of subkeys
+                   size_t *pnMaxKeyLen,    // max len of subkey name
+                   size_t *pnValues,       // number of values
+                   size_t *pnMaxValueLen) const;
 #else
   bool  GetKeyInfo(ulong *pnSubKeys,      // number of subkeys
                    ulong *pnMaxKeyLen,    // max len of subkey name