* wxCreateDynamicObject() uses an hashtable now

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index d2f31f0096ffa8fe5be74999d0e5b362ad5d3884..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;
@@ -70,14 +70,14 @@ wxStatusBar::~wxStatusBar(void)
                delete[] m_statusStrings;
 }
 
-bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
-           const long style,
+           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, const wxWindowID id,
   return success;
 }
 
-void wxStatusBar::SetFieldsCount(const int number, const int *widths)
+void wxStatusBar::SetFieldsCount(int number, const int widths[])
 {
   m_nFields = number;
 
@@ -114,7 +114,7 @@ void wxStatusBar::SetFieldsCount(const int number, const int *widths)
                SetStatusWidths(number, widths);
 }
 
-void wxStatusBar::SetStatusText(const wxString& text, const int number)
+void wxStatusBar::SetStatusText(const wxString& text, int number)
 {
   if ((number < 0) || (number >= m_nFields))
     return;
@@ -123,14 +123,14 @@ void wxStatusBar::SetStatusText(const wxString& text, const 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());
 #endif
 }
 
-wxString wxStatusBar::GetStatusText(const int n) const
+wxString wxStatusBar::GetStatusText(int n) const
 {
   if ((n < 0) || (n >= m_nFields))
     return wxString("");
@@ -138,7 +138,7 @@ wxString wxStatusBar::GetStatusText(const int n) const
     return m_statusStrings[n];
 }
 
-void wxStatusBar::SetStatusWidths(const int n, const 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)
@@ -178,7 +178,7 @@ void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
        DrawField(dc, i);
 }
 
-void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
+void wxStatusBar::DrawFieldText(wxDC& dc, int i)
 {
   int leftMargin = 2;
 
@@ -201,7 +201,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
   dc.DestroyClippingRegion();
 }
 
-void wxStatusBar::DrawField(wxDC& dc, const int i)
+void wxStatusBar::DrawField(wxDC& dc, int i)
 {
   wxRectangle rect;
   GetFieldRect(i, rect);
@@ -232,7 +232,7 @@ void wxStatusBar::DrawField(wxDC& dc, const int i)
 }
 
   // Get the position and size of the field's internal bounding rectangle
-bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
+bool wxStatusBar::GetFieldRect(int n, wxRectangle& rect) const
 {
   if ((n < 0) || (n >= m_nFields))
     return FALSE;