1) keyboard handling: now generates NavigationKey events instead of using

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 581d1db266cda690140df81fe828ff4a7abc61fe..0b737b9e1dcb72fd9bb3f44b5df1af909c2fcecc 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+#pragma implementation "statbr95.h"
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -94,7 +98,7 @@ bool wxStatusBar95::Create(wxWindow *parent, wxWindowID id, long style)
   m_windowId = id == -1 ? NewControlId() : id;
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;
   m_windowId = id == -1 ? NewControlId() : id;
 
   DWORD wstyle = WS_CHILD | WS_VISIBLE;

-  if ( style & wxSB_SIZEGRIP )
+  if ( style & wxST_SIZEGRIP )

     wstyle |= SBARS_SIZEGRIP;
 
   m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
     wstyle |= SBARS_SIZEGRIP;
 
   m_hWnd = (WXHWND)CreateStatusWindow(wstyle,


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

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

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


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

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

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


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

-void wxStatusBar95::SetStatusWidths(int n, const int *widths)
+void wxStatusBar95::SetStatusWidths(int n, 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 );


@@ -157,7 +161,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


@@ -198,7 +202,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");


@@ -207,11 +211,14 @@ 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) );
+  wxASSERT( (nField > -1) && (nField < m_nFields) );

 
 

-  wxString str;
-  StatusBar_GetText(hwnd, nField, 
-                    str.GetWriteBuf(StatusBar_GetTextLen(hwnd, nField)));
+  wxString str("");
+  int len = StatusBar_GetTextLen(hwnd, nField);
+  if (len > 0)
+  {
+        StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));
+  }

   return str;
 }
 
   return str;
 }