Fixed a void* to wxObject* conversion error in a return causing compile break across...

[wxWidgets.git] / include / wx / msw / statbr95.h

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 7bc28a7fe181f250627ff999a213269bf55f73bd..1ffe99d425053bef8c9b1b4bc77486dfda5bc5b3 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -2,11 +2,11 @@
 // Name:        msw/statbr95.h
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _STATBR95_H
@@ -16,7 +16,7 @@
 #pragma interface "statbr95.h"
 #endif
 
-#if       USE_NATIVE_STATUSBAR
+#if       wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBar
 {
@@ -31,14 +31,14 @@ public:
   bool Create(wxWindow *parent, wxWindowID id = -1, long style = wxST_SIZEGRIP);
 
   // a status line can have several (<256) fields numbered from 0
-  virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
+  virtual void SetFieldsCount(int number = 1, const int widths[] = NULL);
 
   // each field of status line has it's own text
-  virtual void     SetStatusText(const wxString& text, const int number = 0);
+  virtual void     SetStatusText(const wxString& text, int number = 0);
   virtual wxString GetStatusText(int number = 0) const;
 
   // set status line fields' widths
-  virtual void SetStatusWidths(int n, const int *widths_field);
+  virtual void SetStatusWidths(int n, const int widths_field[]);
 
   // we're going to process WM_SIZE (of the parent window)
   void OnSize(wxSizeEvent& event);
@@ -46,10 +46,10 @@ public:
   DECLARE_EVENT_TABLE()
 
 protected:
-  void CopyFieldsWidth(const int *widths);
+  void CopyFieldsWidth(const int widths[]);
   void SetFieldsWidth();
 };
 
-#endif  // USE_NATIVE_STATUSBAR
+#endif  // wxUSE_NATIVE_STATUSBAR
 
-#endif  //_STATBR95_H
\ No newline at end of file
+#endif