X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/457e6c54a28bc20cf347ba921755d7d5b296aa2a..4fcd60c72f6b90f5063f7000ff5a80a9004055a3:/src/msw/statbr95.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 2749688b1f..6fc87c0d1c 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -36,8 +36,8 @@ #include "wx/msw/private.h" #include -#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) -#include +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) + #include #endif // ---------------------------------------------------------------------------- @@ -47,10 +47,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxWindow); IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95) -BEGIN_EVENT_TABLE(wxStatusBar95, wxWindow) - EVT_SIZE(wxStatusBar95::OnSize) -END_EVENT_TABLE() - // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- @@ -61,27 +57,6 @@ END_EVENT_TABLE() #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 // ============================================================================ @@ -92,9 +67,9 @@ LRESULT APIENTRY wxStatusBarProc(HWND hwnd, wxStatusBar95::wxStatusBar95() { - SetParent(NULL); - m_hWnd = 0; - m_windowId = 0; + SetParent(NULL); + m_hWnd = 0; + m_windowId = 0; } bool wxStatusBar95::Create(wxWindow *parent, @@ -102,17 +77,36 @@ bool wxStatusBar95::Create(wxWindow *parent, long style, const wxString& name) { + wxCHECK_MSG( parent, FALSE, wxT("status bar must have a parent") ); + SetName(name); + SetWindowStyleFlag(style); SetParent(parent); - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; + parent->AddChild(this); + + m_windowId = id == -1 ? NewControlId() : id; DWORD wstyle = WS_CHILD | WS_VISIBLE; - if ( style & wxST_SIZEGRIP ) + + 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 + // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP + // is not given + if ( !(style & wxST_SIZEGRIP) ) + { + wstyle |= CCS_TOP; + } + else + { + // may be some versions of comctl32.dll do need it - anyhow, it won't + // do any harm wstyle |= SBARS_SIZEGRIP; + } m_hWnd = (WXHWND)CreateStatusWindow(wstyle, wxEmptyString, @@ -125,15 +119,8 @@ bool wxStatusBar95::Create(wxWindow *parent, return FALSE; } - // for some reason, subclassing in the usual way doesn't work at all - many - // strange things start happening (status bar is not positioned correctly, - // all methods fail...) - // SubclassWin(m_hWnd); - - // but we want to process the messages from it still, so must subclass it - gs_wndprocStatBar = (WXFARPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC); - SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc); - SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this); + SetFieldsCount(1); + SubclassWin(m_hWnd); return TRUE; } @@ -145,36 +132,38 @@ wxStatusBar95::~wxStatusBar95() 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; - } + 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 + { + delete [] m_statusWidths; + m_statusWidths = NULL; + } } 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; + m_nFields = nFields; - CopyFieldsWidth(widths); - SetFieldsWidth(); + CopyFieldsWidth(widths); + SetFieldsWidth(); } -void wxStatusBar95::SetStatusWidths(int n, const int widths[]) +void wxStatusBar95::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), const int widths[]) { - wxASSERT_MSG( n == m_nFields, _T("field number mismatch") ); + wxASSERT_MSG( n == m_nFields, _T("field number mismatch") ); - CopyFieldsWidth(widths); - SetFieldsWidth(); + CopyFieldsWidth(widths); + SetFieldsWidth(); } void wxStatusBar95::SetFieldsWidth() @@ -241,9 +230,10 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField) 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 @@ -251,14 +241,15 @@ 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 @@ -293,7 +284,7 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const RECT r; if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) ) { - wxLogLastError("SendMessage(SB_GETRECT)"); + wxLogLastError(wxT("SendMessage(SB_GETRECT)")); } wxCopyRECTToRect(r, rect); @@ -301,14 +292,33 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const return TRUE; } -void wxStatusBar95::OnSize(wxSizeEvent& event) +void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) { - FORWARD_WM_SIZE(GetHwnd(), SIZE_RESTORED, - event.GetSize().x, event.GetSize().y, - SendMessage); - - // adjust fields widths to the new size - SetFieldsWidth(); + // 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); + + // 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