#include "wx/msw/private.h"
#include <windowsx.h>
-#if !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
#include <commctrl.h>
#endif
-// ----------------------------------------------------------------------------
-// wxWindows macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxWindow);
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95)
-
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
#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)
-{
- switch (message) {
- case WM_COMMAND:
- case WM_DRAWITEM:
- case WM_MEASUREITEM:
- case WM_SIZE:
- case WM_MOVE:
- case WM_MOUSEMOVE:
- case WM_LBUTTONUP:
- case WM_LBUTTONDBLCLK:
- case WM_RBUTTONDOWN:
- case WM_RBUTTONUP:
- case WM_RBUTTONDBLCLK:
- case WM_MBUTTONDOWN:
- case WM_MBUTTONUP:
- case WM_MBUTTONDBLCLK:
- wxStatusBar95 *sb = (wxStatusBar95 *)GetWindowLong(hwnd, GWL_USERDATA);
- sb->MSWWindowProc(message, wParam, lParam);
- break;
- }
-
- return ::CallWindowProc(CASTWNDPROC gs_wndprocStatBar, hwnd, message, wParam, lParam);
-}
-
// ============================================================================
// implementation
// ============================================================================
wxStatusBar95::wxStatusBar95()
{
- SetParent(NULL);
- m_hWnd = 0;
- m_windowId = 0;
+ SetParent(NULL);
+ m_hWnd = 0;
+ m_windowId = 0;
}
bool wxStatusBar95::Create(wxWindow *parent,
m_windowId = id == -1 ? NewControlId() : id;
- DWORD wstyle = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ ;
+ 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
}
SetFieldsCount(1);
-
- // 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);
+ SubclassWin(m_hWnd);
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)
// 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();
}
-void wxStatusBar95::SetStatusWidths(int WXUNUSED(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();
}
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) ) {
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
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, str.GetWriteBuf(len));
+ str.UngetWriteBuf();
+ }
+
+ return str;
}
int wxStatusBar95::GetBorderX() const
// 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
projects / wxWidgets.git / blobdiff