First attempt at clean-up

[wxWidgets.git] / src / msw / statbr95.cpp

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 1e724c08a70ac4e2c6b651bb6c923c4e7144a065..3792cd8e25edffa5e638787822b2e1ec7e78b7e8 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -13,14 +13,6 @@
 #pragma implementation "statbr95.h"
 #endif
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -35,25 +27,33 @@
   #include "wx/dcclient.h"
 #endif
 
-#include "wx/log.h"
+#ifdef __WIN95__
 
+#include "wx/log.h"
 #include "wx/generic/statusbr.h"
 #include "wx/msw/statbr95.h"
 
 #include  <windows.h>
 #include  <windowsx.h>
 
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) || defined(__TWIN32__)
 #include  <commctrl.h>
 #endif
 
-#if     USE_NATIVE_STATUSBAR
+#ifdef GetClassInfo
+#undef GetClassInfo
+#endif
+
+#ifdef GetClassName
+#undef GetClassName
+#endif
+
+#if wxUSE_NATIVE_STATUSBAR
 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
   BEGIN_EVENT_TABLE(wxStatusBar95, wxStatusBar)
-    EVT_PAINT(wxWindow::OnPaint)
     EVT_SIZE(wxStatusBar95::OnSize)
   END_EVENT_TABLE()
 #endif  //USE_SHARED_LIBRARY
@@ -95,7 +95,10 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
 {
   SetParent(parent);
 
-  m_windowId = id == -1 ? NewControlId() : id;
+  if (id == -1)
+    m_windowId = NewControlId();
+  else
+    m_windowId = id;
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   if ( style & wxST_SIZEGRIP )
@@ -116,7 +119,7 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
   return TRUE;
 }
 
-void wxStatusBar95::CopyFieldsWidth(int *widths)
+void wxStatusBar95::CopyFieldsWidth(const int widths[])
 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];
@@ -131,7 +134,7 @@ void wxStatusBar95::CopyFieldsWidth(int *widths)
   }
 }
 
-void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
+void wxStatusBar95::SetFieldsCount(int nFields, const int widths[])
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 
@@ -141,7 +144,7 @@ void wxStatusBar95::SetFieldsCount(int nFields, int *widths)
   SetFieldsWidth();
 }
 
-void wxStatusBar95::SetStatusWidths(int n, int *widths)
+void wxStatusBar95::SetStatusWidths(int n, const int widths[])
 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );
@@ -161,7 +164,7 @@ void wxStatusBar95::SetFieldsWidth()
     // default: all fields have the same width
     int nWidth = nWindowWidth / m_nFields;
     for ( int i = 0; i < m_nFields; i++ )
-      pWidths[i] = (i + 1) * nWindowWidth;
+      pWidths[i] = (i + 1) * nWidth;
   }
   else {
     // -1 doesn't mean the same thing for wxWindows and Win32, recalc
@@ -211,11 +214,15 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 
 wxString wxStatusBar95::GetStatusText(int nField) const
 {
-  wxASSERT( (nField > 0) && (nField < m_nFields) );
-
-  wxString str;
-  StatusBar_GetText(hwnd, nField, 
-                    str.GetWriteBuf(StatusBar_GetTextLen(hwnd, nField)));
+  wxASSERT( (nField > -1) && (nField < m_nFields) );
+
+  wxString str("");
+  int len = StatusBar_GetTextLen(hwnd, nField);
+  if (len > 0)
+  {
+        StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));
+        str.UngetWriteBuf();
+  }
   return str;
 }
 
@@ -228,4 +235,9 @@ void wxStatusBar95::OnSize(wxSizeEvent& event)
   SetFieldsWidth();
 }
 
-#endif  //USE_NATIVE_STATUSBAR
\ No newline at end of file
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#else
+    #error "wxStatusBar95 is only available under Windows 95 and later."
+#endif // __WIN95__
+