X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fd5cb0124e62ab1fc41f93382a205d95b00e75..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/msw/control.cpp?ds=sidebyside diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 3ae9f711d2..ea72d9e9f3 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -34,22 +34,20 @@ #include #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() { - m_backgroundColour = *wxWHITE; - m_foregroundColour = *wxBLACK; + m_backgroundColour = *wxWHITE; + m_foregroundColour = *wxBLACK; #if WXWIN_COMPATIBILITY - m_callback = 0; + m_callback = 0; #endif // WXWIN_COMPATIBILITY } @@ -58,15 +56,51 @@ wxControl::~wxControl() m_isBeingDeleted = TRUE; } -bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style) + +bool wxControl::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) +{ + bool rval = wxWindow::Create(parent, id, pos, size, style, name); + if (rval) { +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif + } + return rval; +} + +bool wxControl::MSWCreateControl(const wxChar *classname, + WXDWORD style, + const wxPoint& pos, + const wxSize& size, + const wxString& label, + WXDWORD exstyle) { + // VZ: if someone could put a comment here explaining what exactly this is + // needed for, it would be nice... + bool want3D; + + // if no extended style given, determine it ourselves + if ( exstyle == (WXDWORD)-1 ) + { + exstyle = GetExStyle(style, &want3D); + } + + // all controls have these childs (wxWindows creates all controls visible + // by default) + style |= WS_CHILD | WS_VISIBLE; + m_hWnd = (WXHWND)::CreateWindowEx ( - GetExStyle(style), // extended style + exstyle, // extended style classname, // the kind of control to create - NULL, // the window name + label, // the window name style, // the window style - 0, 0, 0, 0, // the window position and size + pos.x, pos.y, // the window position + size.x, size.y, // and size GetHwndOf(GetParent()), // parent (HMENU)GetId(), // child id wxGetInstance(), // app instance @@ -76,12 +110,20 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style) if ( !m_hWnd ) { #ifdef __WXDEBUG__ - wxLogError(_T("Failed to create a control of class '%s'"), classname); + wxLogError(wxT("Failed to create a control of class '%s'"), classname); #endif // DEBUG return FALSE; } +#if wxUSE_CTL3D + if ( want3D ) + { + Ctl3dSubclassCtl(GetHwnd()); + m_useCtl3D = TRUE; + } +#endif // wxUSE_CTL3D + // subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); @@ -91,7 +133,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname, WXDWORD style) return TRUE; } -wxSize wxControl::DoGetBestSize() +wxSize wxControl::DoGetBestSize() const { return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); } @@ -168,26 +210,53 @@ void wxControl::OnEraseBackground(wxEraseEvent& event) // might flicker. RECT rect; - ::GetClientRect((HWND) GetHWND(), &rect); + ::GetClientRect(GetHwnd(), &rect); - HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), - GetBackgroundColour().Green(), - GetBackgroundColour().Blue())); - int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT); + HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour())); - ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush); + HDC hdc = GetHdcOf((*event.GetDC())); + int mode = ::SetMapMode(hdc, MM_TEXT); + + ::FillRect(hdc, &rect, hBrush); ::DeleteObject(hBrush); - ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode); + ::SetMapMode(hdc, mode); } -WXDWORD wxControl::GetExStyle(WXDWORD& style) const +WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam) { - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; +#if wxUSE_CTL3D + if ( m_useCtl3D ) + { + HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); + return (WXHBRUSH) hbrush; + } +#endif // wxUSE_CTL3D + + HDC hdc = (HDC)pDC; + if (GetParent()->GetTransparentBackground()) + SetBkMode(hdc, TRANSPARENT); + else + SetBkMode(hdc, OPAQUE); + + const wxColour& colBack = GetBackgroundColour(); + ::SetBkColor(hdc, wxColourToRGB(colBack)); + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + + return (WXHBRUSH)brush->GetResourceHandle(); +} + +WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const +{ + WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D); - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - if ( want3D || wxStyleHasBorder(m_windowStyle) ) + // Even with extended styles, need to combine with WS_BORDER for them to + // look right. + if ( *want3D || wxStyleHasBorder(m_windowStyle) ) style |= WS_BORDER; return exStyle;