X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..b83290c3ebf1a7dbd8d1ec9e6fad248f5684d7b1:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index b943131324..10f9310197 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -20,19 +20,21 @@ #pragma hdrstop #endif +#include "wx/window.h" +#include "wx/msw/private.h" + #ifndef WX_PRECOMP -#include "wx/dcclient.h" #include "wx/app.h" +#include "wx/dcclient.h" #endif #include "wx/statbox.h" -#include "wx/msw/private.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) - EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) + EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() #endif @@ -41,24 +43,24 @@ END_EVENT_TABLE() * Group box */ -bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id, +bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, - const long style, + long style, const wxString& name) { SetName(name); if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetDefaultBackgroundColour()) ; - SetForegroundColour(parent->GetDefaultForegroundColour()) ; + SetBackgroundColour(parent->GetBackgroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; int x = pos.x; int y = pos.y; @@ -73,14 +75,14 @@ bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id, WXDWORD exStyle = Determine3DEffects(0, &want3D) ; HWND wx_button = - CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle, + CreateWindowEx(exStyle, _T("BUTTON"), (const wxChar *)label, msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); -#if CTL3D +#if wxUSE_CTL3D if (want3D) { Ctl3dSubclassCtl(wx_button); - m_useCtl3D = TRUE; + m_useCtl3D = TRUE; } #endif @@ -89,7 +91,7 @@ bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id, // Subclass again for purposes of dialog editing mode SubclassWin(GetHWND()); - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); SetSize(x, y, width, height); ShowWindow(wx_button, SW_SHOW); @@ -97,64 +99,26 @@ bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id, return TRUE; } -void wxStaticBox::SetLabel(const wxString& label) -{ - SetWindowText((HWND)m_hWnd, (const char *)label); -} - -void wxStaticBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags) +wxSize wxStaticBox::DoGetBestSize() { - int currentX, currentY; - GetPosition(¤tX, ¤tY); - - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; + int cx, cy; + wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; - - // If we're prepared to use the existing size, then... - if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) - { - GetSize(&w1, &h1); - } + int wBox; + GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy); - char buf[300]; + wBox += 3*cx; + int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); - float current_width; - - int cx; - int cy; - float cyf; - - HWND button = (HWND)m_hWnd; - wxGetCharSize(GetHWND(), &cx, &cy,GetFont()); - - GetWindowText(button, buf, 300); - GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL,GetFont()); - if (w1 < 0) - w1 = (int)(current_width + 3*cx) ; - if (h1<0) - h1 = (int)(cyf*EDIT_CONTROL_FACTOR) ; - MoveWindow(button, x1, y1, w1, h1, TRUE); - -#if WXWIN_COMPATIBILITY - GetEventHandler()->OldOnSize(width, height); -#else - wxSizeEvent event(wxSize(width, height), m_windowId); - event.eventObject = this; - GetEventHandler()->ProcessEvent(event); -#endif + return wxSize(wBox, hBox); } -WXHBRUSH wxStaticBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam) { -#if CTL3D +#if wxUSE_CTL3D if ( m_useCtl3D ) { HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); @@ -182,9 +146,24 @@ WXHBRUSH wxStaticBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUIN // outline. void wxStaticBox::OnEraseBackground(wxEraseEvent& event) { - wxWindow *parent = GetParent(); - if ( parent && parent->GetHWND() && (::GetWindowLong((HWND) parent->GetHWND(), GWL_STYLE) & WS_CLIPCHILDREN) ) - { + // If we don't have this (call Default()), we don't paint the background properly. + // If we do have this, we seem to overwrite enclosed controls. + // Is it the WS_CLIPCHILDREN style that's causing the problems? + // Probably - without this style, the background of the window will show through, + // so the control doesn't have to paint it. The window background will always be + // painted before all other controls, therefore there are no problems with + // controls being hidden by the static box. + // So, if we could specify wxCLIP_CHILDREN in window, or not, we could optimise painting better. + // We would assume wxCLIP_CHILDREN in a frame and a scrolled window, but not in a panel. + // Is this too platform-specific?? What else can we do? Not a lot, since we have to pass + // this information from arbitrary wxWindow derivatives, and it depends on what you wish to + // do with the windows. + // Alternatively, just make sure that wxStaticBox is always at the back! There are probably + // few other circumstances where it matters about child clipping. But what about painting onto + // to panel, inside a groupbox? Doesn't appear, because the box wipes it out. + wxWindow *parent = GetParent(); + if ( parent && parent->GetHWND() && (::GetWindowLong((HWND) parent->GetHWND(), GWL_STYLE) & WS_CLIPCHILDREN) ) + { // TODO: May in fact need to generate a paint event for inside this // control's rectangle, otherwise all controls are going to be clipped - // ugh. @@ -193,31 +172,32 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event) RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); + ::GetClientRect(GetHwnd(), &rect); ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush); ::DeleteObject(hBrush); ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode); - } - else - Default(); + } + else + { + event.Skip(); + } } long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - // TODO: somehow, this has to accept mouse clicks in user interface edit mode, - // but not otherwise. Only there is no longer a UI edit mode... - - // It worked before because the message could be processed if not in UI - // edit mode. We have to find some way of distinguishing this. - // Maybe this class can have an AcceptMouseEvents(bool) function; a sort of - // kludge... or, we can search for an active event table entry that will - // intercept mouse events, and if one exists (that isn't the default), - // skip the code below. Too time consuming though. - // Perhaps it's ok to do the default thing *anyway* because the title or edge - // of the window may still be active! - if (nMsg == WM_NCHITTEST) - return Default(); - - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + if ( nMsg == WM_NCHITTEST) + { + int xPos = LOWORD(lParam); // horizontal position of cursor + int yPos = HIWORD(lParam); // vertical position of cursor + + ScreenToClient(&xPos, &yPos); + + // Make sure you can drag by the top of the groupbox, but let + // other (enclosed) controls get mouse events also + if (yPos < 10) + return (long)HTCLIENT; + } + + return wxControl::MSWWindowProc(nMsg, wParam, lParam); }