const/void changes in thread, tabctrl and wave files; wxTabCtrl::InsertItem

now returns bool not int.


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

include/wx/msw/tabctrl.h

@@ -37,55 +37,55 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     * Public interface
     */
 
-    wxTabCtrl(void);
+    wxTabCtrl();
 
-    inline wxTabCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = 0, const wxString& name = "tabCtrl")
+    inline wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = 0, const wxString& name = "tabCtrl")
     {
         Create(parent, id, pos, size, style, name);
     }
-    ~wxTabCtrl(void);
+    ~wxTabCtrl();
 
 // Accessors
 
     // Get the selection
-    int GetSelection(void) const;
+    int GetSelection() const;
 
     // Get the associated image list
-    wxImageList* GetImageList(void) const;
+    wxImageList* GetImageList() const;
 
     // Get the number of items
-    int GetItemCount(void) const;
+    int GetItemCount() const;
 
     // Get the rect corresponding to the tab
-    bool GetItemRect(const int item, wxRect& rect) const;
+    bool GetItemRect(int item, wxRect& rect) const;
 
     // Get the number of rows
-    int GetRowCount(void) const;
+    int GetRowCount() const;
 
     // Get the item text
-    wxString GetItemText(const int item) const ;
+    wxString GetItemText(int item) const ;
 
     // Get the item image
-    int GetItemImage(const int item) const;
+    int GetItemImage(int item) const;
 
     // Get the item data
-    void* GetItemData(const int item) const;
+    void* GetItemData(int item) const;
 
     // Set the selection
-    int SetSelection(const int item);
+    int SetSelection(int item);
 
     // Set the image list
     void SetImageList(wxImageList* imageList);
 
     // Set the text for an item
-    bool SetItemText(const int item, const wxString& text);
+    bool SetItemText(int item, const wxString& text);
 
     // Set the image for an item
-    bool SetItemImage(const int item, const int image);
+    bool SetItemImage(int item, int image);
 
     // Set the data for an item
-    bool SetItemData(const int item, void* data);
+    bool SetItemData(int item, void* data);
 
     // Set the size for a fixed-width tab control
     void SetItemSize(const wxSize& size);
@@ -99,16 +99,16 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
                 const long style = 0, const wxString& name = "tabCtrl");
 
     // Delete all items
-    bool DeleteAllItems(void);
+    bool DeleteAllItems();
 
     // Delete an item
-    bool DeleteItem(const int item);
+    bool DeleteItem(int item);
 
     // Hit test
     int HitTest(const wxPoint& pt, long& flags);
 
     // Insert an item
-    int InsertItem(const int item, const wxString& text, const int imageId = -1, void* data = NULL);
+    bool InsertItem(int item, const wxString& text, int imageId = -1, void* data = NULL);
 
 // Implementation
 

include/wx/msw/wave.h

@@ -16,22 +16,22 @@
 #pragma interface "wave.h"
 #endif
 
-#include <wx/object.h>
+#include "wx/object.h"
 
 class wxWave : public wxObject
 {
 public:
-  wxWave(void);
+  wxWave();
   wxWave(const wxString& fileName, bool isResource = FALSE);
-  ~wxWave(void);
+  ~wxWave();
 
 public:
-  bool  Create(const wxString& sFileName, bool isResource = FALSE);
-  bool  IsOk(void) const { return (m_waveData ? TRUE : FALSE); };
+  bool  Create(const wxString& fileName, bool isResource = FALSE);
+  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
   bool  Play(bool async = TRUE, bool looped = FALSE) const;
 
 protected:
-  bool  Free(void);
+  bool  Free();
 
 private:
   byte* m_waveData;

include/wx/thread.h

@@ -43,18 +43,18 @@ class wxMutexInternal;
 class WXDLLEXPORT wxMutex {
 public:
   // constructor & destructor 
-  wxMutex(void);
-  ~wxMutex(void);
+  wxMutex();
+  ~wxMutex();
 
   // Lock the mutex.
-  wxMutexError Lock(void);
+  wxMutexError Lock();
   // Try to lock the mutex: if it can't, returns immediately with an error.
-  wxMutexError TryLock(void);
+  wxMutexError TryLock();
   // Unlock the mutex.
-  wxMutexError Unlock(void);
+  wxMutexError Unlock();
 
   // Returns true if the mutex is locked.
-  bool IsLocked(void) { return (m_locked > 0); }
+  bool IsLocked() const { return (m_locked > 0); }
 protected:
   friend class wxCondition;
 
@@ -68,17 +68,17 @@ class wxConditionInternal;
 class WXDLLEXPORT wxCondition {
 public:
   // constructor & destructor
-  wxCondition(void);
-  ~wxCondition(void);
+  wxCondition();
+  ~wxCondition();
 
-  // Waits undefinitely.
+  // Waits indefinitely.
   void Wait(wxMutex& mutex);
   // Waits until a signal is raised or the timeout is elapsed.
   bool Wait(wxMutex& mutex, unsigned long sec, unsigned long nsec);
   // Raises a signal: only one "Waiter" is released.
-  void Signal(void);
+  void Signal();
   // Broadcasts to all "Waiters".
-  void Broadcast(void);
+  void Broadcast();
 private:
   wxConditionInternal *p_internal;
 };
@@ -89,46 +89,46 @@ class wxThreadInternal;
 class WXDLLEXPORT wxThread {
 public:
   // constructor & destructor.
-  wxThread(void);
-  virtual ~wxThread(void);
+  wxThread();
+  virtual ~wxThread();
 
   // Create a new thread, this method should check there is only one thread
   // running by object.
-  wxThreadError Create(void);
+  wxThreadError Create();
 
-  // Destroys the thread immediately if the flag DIFFER isn't true.
-  wxThreadError Destroy(void);
+  // Destroys the thread immediately if the defer flag isn't true.
+  wxThreadError Destroy();
 
-  // Switches on the DIFFER flag.
+  // Switches on the defer flag.
   void DeferDestroy(bool on);
 
   // Waits for the termination of the thread.
-  void *Join(void);
+  void *Join();
 
   // Sets the priority to "prio". (Warning: The priority can only be set before
   // the thread is created)
   void SetPriority(int prio);
   // Get the current priority.
-  int GetPriority(void);
+  int GetPriority() const;
 
   // Get the thread ID
-  unsigned long GetID(void);
+  unsigned long GetID() const;
 
   // Returns true if the thread is alive.
-  bool IsAlive(void);
+  bool IsAlive() const;
   // Returns true if the thread is the main thread (aka the GUI thread).
-  static bool IsMain(void);
+  static bool IsMain();
 
   // Called when thread exits.
-  virtual void OnExit(void);
+  virtual void OnExit();
 protected:
   // In case, the DIFFER flag is true, enables another thread to kill this one.
-  void TestDestroy(void);
+  void TestDestroy();
   // Exits from the current thread.
   void Exit(void *status = NULL);
 private:
   // Entry point for the thread.
-  virtual void *Entry(void) = 0;
+  virtual void *Entry() = 0;
 
 private:
   friend class wxThreadInternal;