X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..7d4194184e83bbccf1a88325cca59d8d0d2faef1:/src/msw/statbox.cpp diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 25f303c58a..6ca6074e54 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); @@ -99,10 +101,10 @@ bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id, void wxStaticBox::SetLabel(const wxString& label) { - SetWindowText((HWND)m_hWnd, (const char *)label); + SetWindowText((HWND)m_hWnd, (const wxChar *)label); } -void wxStaticBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags) +void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -117,44 +119,36 @@ void wxStaticBox::SetSize(const int x, const int y, const int width, const int h if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) y1 = currentY; + AdjustForParentClientOrigin(x1, y1, sizeFlags); + // If we're prepared to use the existing size, then... if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) { GetSize(&w1, &h1); } - char buf[300]; - - float current_width; + int 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 + int cyf; + + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); + + GetTextExtent(wxGetWindowText(m_hWnd), ¤t_width, &cyf, + NULL,NULL, & this->GetFont()); + if ( w1 < 0 ) + w1 = current_width + 3*cx; + if ( h1 < 0 ) + h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cyf); + + MoveWindow((HWND)m_hWnd, x1, y1, w1, h1, TRUE); } -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); @@ -214,26 +208,14 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event) ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode); } else - Default(); + { + 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(); - - if (nMsg == WM_NCHITTEST) + if (nMsg == WM_NCHITTEST) { int xPos = LOWORD(lParam); // horizontal position of cursor int yPos = HIWORD(lParam); // vertical position of cursor @@ -246,6 +228,6 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) return (long)HTCLIENT; } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return wxControl::MSWWindowProc(nMsg, wParam, lParam); }