supporting kill focus for single line text controls

[wxWidgets.git] / src / common / statbar.cpp

diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp
index 9db337c9a5f65a821fd3f6dab6c493f3553b5dbf..a05afa4b1b83b8d995817612898965b0110726f5 100644 (file)
--- a/src/common/statbar.cpp
+++ b/src/common/statbar.cpp
@@ -41,8 +41,8 @@ const char wxStatusBarNameStr[] = "statusBar";
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 

-#include <wx/arrimpl.cpp> // This is a magic incantation which must be done!
-WX_DEFINE_OBJARRAY(wxStatusBarPaneArray);
+#include "wx/arrimpl.cpp" // This is a magic incantation which must be done!
+WX_DEFINE_OBJARRAY(wxStatusBarPaneArray)

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -58,7 +58,7 @@ wxStatusBarBase::~wxStatusBarBase()
 {
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers
 {
     // notify the frame that it doesn't have a status bar any longer to avoid
     // dangling pointers

-    wxFrame *frame = dynamic_cast<wxFrame*>(GetParent());
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);

     if ( frame && frame->GetStatusBar() == this )
         frame->SetStatusBar(NULL);
 }
     if ( frame && frame->GetStatusBar() == this )
         frame->SetStatusBar(NULL);
 }


@@ -104,7 +104,7 @@ void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
     else
     {
         for ( size_t i = 0; i < m_panes.GetCount(); i++ )
     else
     {
         for ( size_t i = 0; i < m_panes.GetCount(); i++ )

-            m_panes[i].nWidth = widths[i];
+            m_panes[i].m_nWidth = widths[i];

 
         m_bSameWidthForAllPanes = false;
     }
 
         m_bSameWidthForAllPanes = false;
     }


@@ -121,7 +121,7 @@ void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 
     for ( size_t i = 0; i < m_panes.GetCount(); i++ )
     wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") );
 
     for ( size_t i = 0; i < m_panes.GetCount(); i++ )

-        m_panes[i].nStyle = styles[i];
+        m_panes[i].m_nStyle = styles[i];

 
     // update the display after the widths changed
     Refresh();
 
     // update the display after the widths changed
     Refresh();


@@ -158,10 +158,10 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {
 
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {

-            if ( m_panes[i].nWidth >= 0 )
-                nTotalWidth += m_panes[i].nWidth;
+            if ( m_panes[i].GetWidth() >= 0 )
+                nTotalWidth += m_panes[i].GetWidth();

             else
             else

-                nVarCount += -m_panes[i].nWidth;
+                nVarCount += -m_panes[i].GetWidth();

         }
 
         // the amount of extra width we have per each var width field
         }
 
         // the amount of extra width we have per each var width field


@@ -170,12 +170,12 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
         // do fill the array
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {
         // do fill the array
         for ( i = 0; i < m_panes.GetCount(); i++ )
         {

-            if ( m_panes[i].nWidth >= 0 )
-                widths.Add(m_panes[i].nWidth);
+            if ( m_panes[i].GetWidth() >= 0 )
+                widths.Add(m_panes[i].GetWidth());

             else
             {
             else
             {

-                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].nWidth)) / nVarCount : 0;
-                nVarCount += m_panes[i].nWidth;
+                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].GetWidth())) / nVarCount : 0;
+                nVarCount += m_panes[i].GetWidth();

                 widthExtra -= nVarWidth;
                 widths.Add(nVarWidth);
             }
                 widthExtra -= nVarWidth;
                 widths.Add(nVarWidth);
             }


@@ -192,16 +192,19 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
     // save current status text in the stack
 void wxStatusBarBase::PushStatusText(const wxString& text, int number)
 {
     // save current status text in the stack

-    m_panes[number].arrStack.push_back(GetStatusText(number));
+    m_panes[number].m_arrStack.push_back(GetStatusText(number));

 
 

-    // update current status text

     SetStatusText(text, number);
     SetStatusText(text, number);

+        // update current status text (eventually also in the native control)

 }
 
 void wxStatusBarBase::PopStatusText(int number)
 {
 }
 
 void wxStatusBarBase::PopStatusText(int number)
 {

-    wxString text = m_panes[number].arrStack.back();
-    m_panes[number].arrStack.pop_back();  // also remove it from the stack
+    wxASSERT_MSG(m_panes[number].m_arrStack.GetCount() == 1,
+                 "can't pop any further string");
+
+    wxString text = m_panes[number].m_arrStack.back();
+    m_panes[number].m_arrStack.pop_back();  // also remove it from the stack

 
     // restore the popped status text in the pane
     SetStatusText(text, number);
 
     // restore the popped status text in the pane
     SetStatusText(text, number);