X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5c56bd5fa167a02334d35deb0006e80cdfd44d..d05005c11f6c702273be30d4c306e94081df06aa:/src/msw/statbr95.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 5f49a73018..9b310fcf23 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/statbr95.cpp +// Name: src/msw/statbr95.cpp // Purpose: native implementation of wxStatusBar // Author: Vadim Zeitlin // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "statbr95.h" -#endif - // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,24 +16,24 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" -#endif - -#if wxUSE_STATUSBAR && defined(__WIN95__) && wxUSE_NATIVE_STATUSBAR +#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR -#include "wx/intl.h" -#include "wx/log.h" #include "wx/statusbr.h" +#ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + #include "wx/msw/private.h" #include -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include +#if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" #endif // ---------------------------------------------------------------------------- @@ -120,6 +116,14 @@ bool wxStatusBar95::Create(wxWindow *parent, SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR)); + // 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; } @@ -185,6 +189,12 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField) wxCHECK_RET( (nField >= 0) && (nField < m_nFields), _T("invalid statusbar field index") ); + if ( strText == GetStatusText(nField) ) + { + // don't call StatusBar_SetText() to avoid flicker + return; + } + // Get field style, if any int style; if (m_statusStyles) @@ -208,7 +218,7 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField) // 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) ) + if ( !StatusBar_SetText(GetHwnd(), nField | style, strText.wx_str()) ) { wxLogLastError(wxT("StatusBar_SetText")); } @@ -264,25 +274,94 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const wxLogLastError(wxT("SendMessage(SB_GETRECT)")); } +#if wxUSE_UXTHEME + wxUxThemeHandle theme((wxStatusBar95 *)this, L"Status"); // const_cast + if ( theme ) + { + // by default Windows has a 2 pixel border to the right of the left + // divider (or it could be a bug) but it looks wrong so remove it + if ( i != 0 ) + { + r.left -= 2; + } + + wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL, + 1 /* SP_PANE */, 0, + &r, &r); + } +#endif + wxCopyRECTToRect(r, rect); return true; } +// no idea for a default width, just choose something +#define DEFAULT_FIELD_WIDTH 25 + +wxSize wxStatusBar95::DoGetBestSize() const +{ + int borders[3]; + SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders); + + // calculate width + int width = 0; + for ( int i = 0; i < m_nFields; ++i ) + { + int widthField = m_statusWidths ? m_statusWidths[i] + : DEFAULT_FIELD_WIDTH; + if ( widthField >= 0 ) + { + width += m_statusWidths[i]; + } + else + { + // variable width field, its width is really a proportion + // related to the other fields + width += -widthField*DEFAULT_FIELD_WIDTH; + } + + // add the space between fields + width += borders[2]; + } + + if ( !width ) + { + // still need something even for an empty status bar + width = 2*DEFAULT_FIELD_WIDTH; + } + + + // calculate height + int height; + wxGetCharSize(GetHWND(), NULL, &height, GetFont()); + height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height); + height += borders[1]; + + wxSize best(width, height); + CacheBestSize(best); + return best; +} + 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 - wxWindowMSW::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 + // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly + // if other windows are size deferred + ::SetWindowPos(GetHwnd(), NULL, x, y, width, height, + SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE +#ifndef __WXWINCE__ + | SWP_NOCOPYBITS | SWP_NOSENDCHANGING +#endif + ); + } // adjust fields widths to the new size SetFieldsWidth(); @@ -325,12 +404,58 @@ void wxStatusBar95::SetStatusStyles(int n, const int styles[]) // 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)) + if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str())) { wxLogLastError(wxT("StatusBar_SetText")); } } } -#endif // __WIN95__ && wxUSE_NATIVE_STATUSBAR +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 // wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR