X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85b43fbf7a512ea49cf491320c458bec705762ed..05b2a432c6cecd70c825a99ff357ab0cde1877f8:/src/msw/control.cpp?ds=inline diff --git a/src/msw/control.cpp b/src/msw/control.cpp index bbb8d431dd..65042f462e 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -9,7 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "control.h" #endif @@ -27,6 +35,7 @@ #include "wx/app.h" #include "wx/dcclient.h" #include "wx/log.h" + #include "wx/settings.h" #endif #include "wx/control.h" @@ -37,32 +46,39 @@ #include #endif +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) END_EVENT_TABLE() -// Item members -wxControl::wxControl() -{ -#if WXWIN_COMPATIBILITY - m_callback = 0; -#endif // WXWIN_COMPATIBILITY -} +// ============================================================================ +// wxControl implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxControl ctor/dtor +// ---------------------------------------------------------------------------- wxControl::~wxControl() { m_isBeingDeleted = TRUE; } +// ---------------------------------------------------------------------------- +// control window creation +// ---------------------------------------------------------------------------- bool wxControl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, - const wxValidator& validator, + const wxValidator& wxVALIDATOR_PARAM(validator), const wxString& name) { if ( !wxWindow::Create(parent, id, pos, size, style, name) ) @@ -96,25 +112,28 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // if no extended style given, determine it ourselves if ( exstyle == (WXDWORD)-1 ) { -// exstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); exstyle = 0; - (void) MSWGetStyle(GetWindowStyle(), & exstyle) ; + (void) MSWGetStyle(GetWindowStyle(), &exstyle); } // all controls should have this style style |= WS_CHILD; - // create the control visible if it's currently shown for wxWindows + // create the control visible if it's currently shown for wxWidgets if ( m_isShown ) { style |= WS_VISIBLE; } + // choose the position for the control int x = pos.x == -1 ? 0 : pos.x, y = pos.y == -1 ? 0 : pos.y, w = size.x == -1 ? 0 : size.x, h = size.y == -1 ? 0 : size.y; + // ... and adjust it to account for ap ossible parent frames toolbar + AdjustForParentClientOrigin(x, y); + m_hWnd = (WXHWND)::CreateWindowEx ( exstyle, // extended style @@ -144,19 +163,41 @@ bool wxControl::MSWCreateControl(const wxChar *classname, } #endif // wxUSE_CTL3D - // install wxWindows window proc for this window + // install wxWidgets window proc for this window SubclassWin(m_hWnd); - // controls use the same font and colours as their parent dialog by default + // set up fonts and colours InheritAttributes(); + SetFont(GetDefaultAttributes().font); // set the size now if no initial size specified - if ( w <= 0 || h <= 0 ) + SetInitialBestSize(size); + + return TRUE; +} + +// ---------------------------------------------------------------------------- +// various accessors +// ---------------------------------------------------------------------------- + +wxBorder wxControl::GetDefaultBorder() const +{ + // we want to automatically give controls a sunken style (confusingly, + // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE + // which is not sunken at all under Windows XP -- rather, just the default) + return wxBORDER_SUNKEN; +} + +WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + long msStyle = wxWindow::MSWGetStyle(style, exstyle); + + if ( AcceptsFocus() ) { - SetBestSize(size); + msStyle |= WS_TABSTOP; } - return TRUE; + return msStyle; } wxSize wxControl::DoGetBestSize() const @@ -164,18 +205,42 @@ wxSize wxControl::DoGetBestSize() const return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); } -bool wxControl::ProcessCommand(wxCommandEvent& event) +/* static */ wxVisualAttributes +wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { -#if WXWIN_COMPATIBILITY - if ( m_callback ) - { - (void)(*m_callback)(*this, event); + wxVisualAttributes attrs; - return TRUE; - } - else -#endif // WXWIN_COMPATIBILITY + // old school (i.e. not "common") controls use the standard dialog font + // by default + attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + + // most, or at least many, of the controls use the same colours as the + // buttons -- others will have to override this (and possibly simply call + // GetCompositeControlsDefaultAttributes() from their versions) + attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT); + attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + return attrs; +} + +// another version for the "composite", i.e. non simple controls +/* static */ wxVisualAttributes +wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attrs; + attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); + + return attrs; +} + +// ---------------------------------------------------------------------------- +// message handling +// ---------------------------------------------------------------------------- + +bool wxControl::ProcessCommand(wxCommandEvent& event) +{ return GetEventHandler()->ProcessEvent(event); } @@ -241,11 +306,17 @@ void wxControl::OnEraseBackground(wxEraseEvent& event) HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour())); HDC hdc = GetHdcOf((*event.GetDC())); + +#ifndef __WXWINCE__ int mode = ::SetMapMode(hdc, MM_TEXT); +#endif ::FillRect(hdc, &rect, hBrush); ::DeleteObject(hBrush); + +#ifndef __WXWINCE__ ::SetMapMode(hdc, mode); +#endif } WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), @@ -269,11 +340,6 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED #endif // wxUSE_CTL3D HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground() /* || (GetParent()->GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND) */ ) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); ::SetBkColor(hdc, wxColourToRGB(colBack)); @@ -284,22 +350,13 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED return (WXHBRUSH)brush->GetResourceHandle(); } -WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const -{ - long msStyle = wxWindow::MSWGetStyle(style, exstyle); - - if ( AcceptsFocus() ) - { - msStyle |= WS_TABSTOP; - } - - return msStyle; -} - // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- +// this is used in radiobox.cpp and slider95.cpp and should be removed as soon +// as it is not needed there any more! +// // Call this repeatedly for several wnds to find the overall size // of the widget. // Call it initially with -1 for all values in rect.