don't define functions unused under CE when compiling for it (avoids warnings)

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

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index c3cf3960bf90027def653d071e09cc83c8bd3626..3b203df0b0425507e547b35fbd3aedbde11f0d37 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -6,10 +6,10 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbr95.h"
 #endif
 
 #pragma implementation "statbr95.h"
 #endif
 


@@ -27,7 +27,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 +36,10 @@
 #include "wx/msw/private.h"
 #include <windowsx.h>
 
 #include "wx/msw/private.h"
 #include <windowsx.h>
 

-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#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
 // ----------------------------------------------------------------------------


@@ -57,27 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95)
 #define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
 #define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
 
 #define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
 #define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
 

-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-
-// static WNDPROC gs_wndprocStatBar = NULL;
-static WXFARPROC gs_wndprocStatBar = (WXFARPROC) NULL;
-
-LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
-                                 UINT message,
-                                 WPARAM wParam,
-                                 LPARAM lParam)
-{
-    if ( message == WM_COMMAND )
-    {
-        wxStatusBar95 *sb = (wxStatusBar95 *)GetWindowLong(hwnd, GWL_USERDATA);
-        sb->MSWWindowProc(message, wParam, lParam);
-    }
-
-    return ::CallWindowProc(CASTWNDPROC gs_wndprocStatBar, hwnd, message, wParam, lParam);
-}
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -88,9 +60,9 @@ LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
 
 wxStatusBar95::wxStatusBar95()
 {
 
 wxStatusBar95::wxStatusBar95()
 {

-  SetParent(NULL);
-  m_hWnd = 0;
-  m_windowId = 0;
+    SetParent(NULL);
+    m_hWnd = 0;
+    m_windowId = 0;

 }
 
 bool wxStatusBar95::Create(wxWindow *parent,
 }
 
 bool wxStatusBar95::Create(wxWindow *parent,


@@ -110,6 +82,9 @@ bool wxStatusBar95::Create(wxWindow *parent,
 
     DWORD wstyle = WS_CHILD | WS_VISIBLE;
 
 
     DWORD wstyle = WS_CHILD | WS_VISIBLE;
 

+    if ( style & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+

     // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
     // (at least in the version of comctl32.dll I'm using), and the only way to
     // turn it off is to use CCS_TOP style - as we position the status bar
     // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
     // (at least in the version of comctl32.dll I'm using), and the only way to
     // turn it off is to use CCS_TOP style - as we position the status bar


@@ -121,9 +96,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,


@@ -138,57 +115,32 @@ bool wxStatusBar95::Create(wxWindow *parent,
     }
 
     SetFieldsCount(1);
     }
 
     SetFieldsCount(1);

+    SubclassWin(m_hWnd);

 
 

-    // we can't subclass this window as usual because the status bar window
-    // proc processes WM_SIZE and WM_PAINT specially
-    //  SubclassWin(m_hWnd);
-
-    // but we want to process the messages from it still, so do custom
-    // subclassing here
-    gs_wndprocStatBar = (WXFARPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC);
-    SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc);
-    SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this);
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));

 
     return TRUE;
 }
 
 wxStatusBar95::~wxStatusBar95()
 {
 
     return TRUE;
 }
 
 wxStatusBar95::~wxStatusBar95()
 {

-    delete [] m_statusWidths;
-}
-
-void wxStatusBar95::CopyFieldsWidth(const int widths[])
-{
-  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 {
-    delete [] m_statusWidths;
-    m_statusWidths = NULL;
-  }

 }
 
 void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
 {
 }
 
 void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
 {

-  // this is 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 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();

 }
 
 void wxStatusBar95::SetFieldsWidth()
 }
 
 void wxStatusBar95::SetFieldsWidth()


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

-    int *pWidths = new int[m_nFields];
+    wxArrayInt widthsAbs =
+        CalculateAbsWidths(GetClientSize().x - extraWidth*(m_nFields - 1));

 
 

-    int nWindowWidth, y;
-    GetClientSize(&nWindowWidth, &y);
+    int *pWidths = new int[m_nFields];

 
 

-    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++;
-        }
-
-        int nVarWidth = (nWindowWidth - nTotalWidth) / nVarCount;
-
-        // 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) ) {


@@ -255,9 +176,10 @@ 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) ) {
-    wxLogLastError(wxT("StatusBar_SetText"));
-  }
+    if ( !StatusBar_SetText(GetHwnd(), nField, strText) )
+    {
+        wxLogLastError(wxT("StatusBar_SetText"));
+    }

 }
 
 wxString wxStatusBar95::GetStatusText(int nField) const
 }
 
 wxString wxStatusBar95::GetStatusText(int nField) const


@@ -265,14 +187,14 @@ wxString wxStatusBar95::GetStatusText(int nField) const
     wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
                  _T("invalid statusbar field index") );
 
     wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
                  _T("invalid statusbar field index") );
 

-  wxString str;
-  int len = StatusBar_GetTextLen(GetHwnd(), nField);
-  if (len > 0)
-  {
-    StatusBar_GetText(GetHwnd(), nField, str.GetWriteBuf(len));
-    str.UngetWriteBuf();
-  }
-  return str;
+    wxString str;
+    int len = StatusBar_GetTextLen(GetHwnd(), nField);
+    if ( len > 0 )
+    {
+        StatusBar_GetText(GetHwnd(), nField, wxStringBuffer(str, len));
+    }
+
+    return str;

 }
 
 int wxStatusBar95::GetBorderX() const
 }
 
 int wxStatusBar95::GetBorderX() const


@@ -307,7 +229,7 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
     RECT r;
     if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
     {
     RECT r;
     if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
     {

-        wxLogLastError("SendMessage(SB_GETRECT)");
+        wxLogLastError(wxT("SendMessage(SB_GETRECT)"));

     }
 
     wxCopyRECTToRect(r, rect);
     }
 
     wxCopyRECTToRect(r, rect);


@@ -328,10 +250,20 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
     // 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
     // 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);
+    wxWindowMSW::DoMoveWindow(x, y, width, height);

 
     // 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);
+    }

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