use wxIsNullDouble instead of comparing m_ration with 0

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index df3eacee72badff1c160c47284a32273ede4d1e2..82773a5d17e80dc80e42bb7751a7ad9a49df74f6 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -6,13 +6,9 @@
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -27,7 +23,7 @@
   #include "wx/dcclient.h"
 #endif
 
   #include "wx/dcclient.h"
 #endif
 

-#if defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR && defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR

 
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"


@@ -36,17 +32,10 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
 #include "wx/msw/private.h"
 #include <windowsx.h>
 

-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

-// ----------------------------------------------------------------------------
-// wxWindows macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxWindow);
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95)
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -77,7 +66,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
                            long style,
                            const wxString& name)
 {
                            long style,
                            const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, wxT("status bar must have a parent") );
+    wxCHECK_MSG( parent, false, wxT("status bar must have a parent") );

 
     SetName(name);
     SetWindowStyleFlag(style);
 
     SetName(name);
     SetWindowStyleFlag(style);


@@ -85,7 +74,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;

 
     DWORD wstyle = WS_CHILD | WS_VISIBLE;
 
 
     DWORD wstyle = WS_CHILD | WS_VISIBLE;
 


@@ -103,9 +92,11 @@ bool wxStatusBar95::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

+#ifndef __WXWINCE__

         // may be some versions of comctl32.dll do need it - anyhow, it won't
         // do any harm
         wstyle |= SBARS_SIZEGRIP;
         // may be some versions of comctl32.dll do need it - anyhow, it won't
         // do any harm
         wstyle |= SBARS_SIZEGRIP;

+#endif

     }
 
     m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
     }
 
     m_hWnd = (WXHWND)CreateStatusWindow(wstyle,


@@ -116,34 +107,35 @@ bool wxStatusBar95::Create(wxWindow *parent,
     {
         wxLogSysError(_("Failed to create a status bar."));
 
     {
         wxLogSysError(_("Failed to create a status bar."));
 

-        return FALSE;
+        return false;

     }
 
     SetFieldsCount(1);
     SubclassWin(m_hWnd);
     }
 
     SetFieldsCount(1);
     SubclassWin(m_hWnd);

+    InheritAttributes();

 
 

-    return TRUE;
-}
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));

 
 

-wxStatusBar95::~wxStatusBar95()
-{
-    delete [] m_statusWidths;
+    // we must refresh the frame size when the statusbar is created, because
+    // its client area might change
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame )
+    {
+        frame->SendSizeEvent();
+    }
+
+    return true;

 }
 
 }
 

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

 {
 {

-    if (widths && !m_statusWidths)
-        m_statusWidths = new int[m_nFields];
-
-    if ( widths != NULL )
-    {
-        for ( int i = 0; i < m_nFields; i++ )
-            m_statusWidths[i] = widths[i];
-    }
-    else // no widths
+    // we must refresh the frame size when the statusbar is deleted but the
+    // frame is not - otherwise statusbar leaves a hole in the place it used to
+    // occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )

     {
     {

-        delete [] m_statusWidths;
-        m_statusWidths = NULL;
+        frame->SendSizeEvent();

     }
 }
 
     }
 }
 


@@ -152,17 +144,15 @@ void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
     // this is a Windows limitation
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
 
     // this is a Windows limitation
     wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
 

-    m_nFields = nFields;
+    wxStatusBarBase::SetFieldsCount(nFields, widths);

 
 

-    CopyFieldsWidth(widths);

     SetFieldsWidth();
 }
 
     SetFieldsWidth();
 }
 

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

 {
 {

-    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+    wxStatusBarBase::SetStatusWidths(n, widths);

 
 

-    CopyFieldsWidth(widths);

     SetFieldsWidth();
 }
 
     SetFieldsWidth();
 }
 


@@ -176,46 +166,15 @@ void wxStatusBar95::SetFieldsWidth()
 
     int extraWidth = aBorders[2]; // space between fields
 
 
     int extraWidth = aBorders[2]; // space between fields
 

-    int *pWidths = new int[m_nFields];
-
-    int nWindowWidth, y;
-    GetClientSize(&nWindowWidth, &y);
-
-    if ( m_statusWidths == NULL ) {
-        // default: all fields have the same width
-        int nWidth = nWindowWidth / m_nFields;
-        for ( int i = 0; i < m_nFields; i++ )
-            pWidths[i] = (i + 1) * nWidth;
-    }
-    else {
-        // -1 doesn't mean the same thing for wxWindows and Win32, recalc
-        int nTotalWidth = 0,
-        nVarCount = 0,
-        i;
-        for ( i = 0; i < m_nFields; i++ ) {
-            if ( m_statusWidths[i] == -1 )
-                nVarCount++;
-            else
-                nTotalWidth += m_statusWidths[i] + extraWidth;
-        }
-
-        if ( nVarCount == 0 ) {
-            wxFAIL_MSG( _T("at least one field must be of variable width") );
-
-            nVarCount++;
-        }
+    wxArrayInt widthsAbs =
+        CalculateAbsWidths(GetClientSize().x - extraWidth*(m_nFields - 1));

 
 

-        int nVarWidth = (nWindowWidth - nTotalWidth) / nVarCount;
+    int *pWidths = new int[m_nFields];

 
 

-        // do fill the array
-        int nCurPos = 0;
-        for ( i = 0; i < m_nFields; i++ ) {
-            if ( m_statusWidths[i] == -1 )
-                nCurPos += nVarWidth;
-            else
-                nCurPos += m_statusWidths[i] + extraWidth;
-            pWidths[i] = nCurPos;
-        }
+    int nCurPos = 0;
+    for ( int i = 0; i < m_nFields; i++ ) {
+        nCurPos += widthsAbs[i] + extraWidth;
+        pWidths[i] = nCurPos;

     }
 
     if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {
     }
 
     if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {


@@ -230,7 +189,30 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
     wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
                  _T("invalid statusbar field index") );
 
     wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
                  _T("invalid statusbar field index") );
 

-    if ( !StatusBar_SetText(GetHwnd(), nField, strText) )
+    // Get field style, if any
+    int style;
+    if (m_statusStyles)
+    {
+        switch(m_statusStyles[nField])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+    }
+    else
+        style = 0;
+
+    // Pass both field number and style. MSDN library doesn't mention
+    // that nField and style have to be 'ORed'
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText) )

     {
         wxLogLastError(wxT("StatusBar_SetText"));
     }
     {
         wxLogLastError(wxT("StatusBar_SetText"));
     }


@@ -245,8 +227,7 @@ wxString wxStatusBar95::GetStatusText(int nField) const
     int len = StatusBar_GetTextLen(GetHwnd(), nField);
     if ( len > 0 )
     {
     int len = StatusBar_GetTextLen(GetHwnd(), nField);
     if ( len > 0 )
     {

-        StatusBar_GetText(GetHwnd(), nField, str.GetWriteBuf(len));
-        str.UngetWriteBuf();
+        StatusBar_GetText(GetHwnd(), nField, wxStringBuffer(str, len));

     }
 
     return str;
     }
 
     return str;


@@ -278,7 +259,7 @@ void wxStatusBar95::SetMinHeight(int height)
 
 bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
 {
 
 bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
 {

-    wxCHECK_MSG( (i >= 0) && (i < m_nFields), FALSE,
+    wxCHECK_MSG( (i >= 0) && (i < m_nFields), false,

                  _T("invalid statusbar field index") );
 
     RECT r;
                  _T("invalid statusbar field index") );
 
     RECT r;


@@ -289,26 +270,120 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
 
     wxCopyRECTToRect(r, rect);
 
 
     wxCopyRECTToRect(r, rect);
 

-    return TRUE;
+    return true;

 }
 
 }
 

+#ifndef SWP_NOSENDCHANGING
+#define SWP_NOSENDCHANGING 0
+#endif
+

 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
 {
 void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
 {

-    // the status bar wnd proc must be forwarded the WM_SIZE message whenever
-    // the stat bar position/size is changed because it normally positions the
-    // control itself along bottom or top side of the parent window - failing
-    // to do so will result in nasty visual effects
-    FORWARD_WM_SIZE(GetHwnd(), SIZE_RESTORED, x, y, SendMessage);
-
-    // but now, when the standard status bar wnd proc did all it wanted to do,
-    // move the status bar to its correct location - usually this call may be
-    // omitted because for normal status bars (positioned along the bottom
-    // edge) the position is already set correctly, but if the user wants to
-    // position them in some exotic location, this is really needed
-    wxWindow::DoMoveWindow(x, y, width, height);
+    if ( GetParent()->IsSizeDeferred() )
+    {
+        wxWindowMSW::DoMoveWindow(x, y, width, height);
+    }
+    else
+    {
+        // parent pos/size isn't deferred so do it now but don't send
+        // WM_WINDOWPOSCHANGING since we don't want to change pos/size later
+        ::SetWindowPos(GetHwnd(), NULL, x, y, width, height,
+                       SWP_NOZORDER | SWP_NOSENDCHANGING);
+    }

 
     // adjust fields widths to the new size
     SetFieldsWidth();
 
     // adjust fields widths to the new size
     SetFieldsWidth();

+
+    // we have to trigger wxSizeEvent if there are children window in status
+    // bar because GetFieldRect returned incorrect (not updated) values up to
+    // here, which almost certainly resulted in incorrectly redrawn statusbar
+    if ( m_children.GetCount() > 0 )
+    {
+        wxSizeEvent event(GetClientSize(), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+void wxStatusBar95::SetStatusStyles(int n, const int styles[])
+{
+    wxStatusBarBase::SetStatusStyles(n, styles);
+
+    if (n != m_nFields)
+        return;
+
+    for (int i = 0; i < n; i++)
+    {
+        int style;
+        switch(styles[i])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+        // The SB_SETTEXT message is both used to set the field's text as well as
+        // the fields' styles. MSDN library doesn't mention
+        // that nField and style have to be 'ORed'
+        wxString text = GetStatusText(i);
+        if (!StatusBar_SetText(GetHwnd(), style | i, text))
+        {
+            wxLogLastError(wxT("StatusBar_SetText"));
+        }
+    }
+}
+
+WXLRESULT
+wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+#ifndef __WXWINCE__
+    if ( nMsg == WM_WINDOWPOSCHANGING )
+    {
+        WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
+        int x, y, w, h;
+        GetPosition(&x, &y);
+        GetSize(&w, &h);
+
+        // we need real window coords and not wx client coords
+        AdjustForParentClientOrigin(x, y);
+
+        lpPos->x  = x;
+        lpPos->y  = y;
+        lpPos->cx = w;
+        lpPos->cy = h;
+
+        return 0;
+    }
+
+    if ( nMsg == WM_NCLBUTTONDOWN )
+    {
+        // if hit-test is on gripper then send message to TLW to begin
+        // resizing. It is possible to send this message to any window.
+        if ( wParam == HTBOTTOMRIGHT )
+        {
+            wxWindow *win;
+
+            for ( win = GetParent(); win; win = win->GetParent() )
+            {
+                if ( win->IsTopLevel() )
+                {
+                    SendMessage(GetHwndOf(win), WM_NCLBUTTONDOWN,
+                                wParam, lParam);
+
+                    return 0;
+                }
+            }
+        }
+    }
+#endif
+
+    return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 #endif // __WIN95__ && wxUSE_NATIVE_STATUSBAR
 }
 
 #endif // __WIN95__ && wxUSE_NATIVE_STATUSBAR