Added GetRect to region iterator; cured window.cpp problem for BC++

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index e740741b3141c18628c6414ca6a53ae84be8f31a..4965c95ff2d1cd03e207817208546a43415a6b80 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -13,14 +13,6 @@
 #pragma implementation "statbr95.h"
 #endif
 
 #pragma implementation "statbr95.h"
 #endif
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -47,7 +39,7 @@
 #include  <commctrl.h>
 #endif
 
 #include  <commctrl.h>
 #endif
 

-#if     USE_NATIVE_STATUSBAR
+#if     wxUSE_NATIVE_STATUSBAR

 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);
 
 #if     !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxStatusBar);


@@ -95,7 +87,10 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
 {
   SetParent(parent);
 
 {
   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 )
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   if ( style & wxST_SIZEGRIP )


@@ -116,7 +111,7 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxStatusBar95::CopyFieldsWidth(const int *widths)
+void wxStatusBar95::CopyFieldsWidth(const int widths[])

 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];
 {
   if (widths && !m_statusWidths)
     m_statusWidths = new int[m_nFields];


@@ -131,7 +126,7 @@ void wxStatusBar95::CopyFieldsWidth(const int *widths)
   }
 }
 
   }
 }
 

-void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
+void wxStatusBar95::SetFieldsCount(int nFields, const int widths[])

 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 


@@ -141,7 +136,7 @@ void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

-void wxStatusBar95::SetStatusWidths(int n, const int *widths)
+void wxStatusBar95::SetStatusWidths(int n, const int widths[])

 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );
 {
   // @@ I don't understand what this function is for...
   wxASSERT( n == m_nFields );


@@ -161,7 +156,7 @@ void wxStatusBar95::SetFieldsWidth()
     // default: all fields have the same width
     int nWidth = nWindowWidth / m_nFields;
     for ( int i = 0; i < m_nFields; i++ )
     // 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
   }
   else {
     // -1 doesn't mean the same thing for wxWindows and Win32, recalc


@@ -202,7 +197,7 @@ void wxStatusBar95::SetFieldsWidth()
   delete [] pWidths;
 }
 
   delete [] pWidths;
 }
 

-void wxStatusBar95::SetStatusText(const wxString& strText, const int nField)
+void wxStatusBar95::SetStatusText(const wxString& strText, int nField)

 {
   if ( !StatusBar_SetText(hwnd, nField, strText) ) {
     wxLogDebug("StatusBar_SetText failed");
 {
   if ( !StatusBar_SetText(hwnd, nField, strText) ) {
     wxLogDebug("StatusBar_SetText failed");


@@ -211,11 +206,15 @@ void wxStatusBar95::SetStatusText(const wxString& strText, const int nField)
 
 wxString wxStatusBar95::GetStatusText(int nField) const
 {
 
 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;
 }
 
   return str;
 }