* wxCreateDynamicObject() uses an hashtable now

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index d78787b1e9f82c34e6cb20284d8203ac7bee40fa..fee8fe43f81b0f434e2d7cac984eeb6ce9fa4994 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -29,7 +29,7 @@
 
 #include "wx/generic/statusbr.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef DrawText
@@ -53,8 +53,8 @@ END_EVENT_TABLE()
 
 wxStatusBar::wxStatusBar(void)
 {
-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
+  m_statusWidths = (int *) NULL;
+  m_statusStrings = (wxString *) NULL;
   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
@@ -76,8 +76,8 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
+  m_statusWidths = (int *) NULL;
+  m_statusStrings = (wxString *) NULL;
   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
@@ -94,7 +94,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
   return success;
 }
 
-void wxStatusBar::SetFieldsCount(int number, int *widths)
+void wxStatusBar::SetFieldsCount(int number, const int widths[])
 {
   m_nFields = number;
 
@@ -123,7 +123,7 @@ void wxStatusBar::SetStatusText(const wxString& text, int number)
 
   Refresh();
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   // For some reason, this can cause major GDI problems - graphics
   // all over the place. E.g. in print previewing.
 //  ::UpdateWindow((HWND) GetHWND());
@@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(int n) const
     return m_statusStrings[n];
 }
 
-void wxStatusBar::SetStatusWidths(int n, int *widths_field)
+void wxStatusBar::SetStatusWidths(int n, const int widths_field[])
 {
   // only set status widths, when n == number of statuswindows
   if (n == m_nFields)