X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e9d23cdae1f6d87c2915910a2998bce9c2e6e71..02a525b385836d41f63e3bbebec869c7b8249026:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index df2d8b1109..ef6dfe5b98 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// 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,22 +46,32 @@ #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() -{ -} +// ============================================================================ +// wxControl implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxControl ctor/dtor +// ---------------------------------------------------------------------------- wxControl::~wxControl() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; } +// ---------------------------------------------------------------------------- +// control window creation +// ---------------------------------------------------------------------------- bool wxControl::Create(wxWindow *parent, wxWindowID id, @@ -63,13 +82,13 @@ bool wxControl::Create(wxWindow *parent, const wxString& name) { if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return FALSE; + return false; #if wxUSE_VALIDATORS SetValidator(validator); #endif - return TRUE; + return true; } bool wxControl::MSWCreateControl(const wxChar *classname, @@ -100,19 +119,19 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // 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; + int x = pos.x == wxDefaultCoord ? 0 : pos.x, + y = pos.y == wxDefaultCoord ? 0 : pos.y, + w = size.x == wxDefaultCoord ? 0 : size.x, + h = size.y == wxDefaultCoord ? 0 : size.y; - // ... and adjust it to account for ap ossible parent frames toolbar + // ... and adjust it to account for a possible parent frames toolbar AdjustForParentClientOrigin(x, y); m_hWnd = (WXHWND)::CreateWindowEx @@ -131,34 +150,37 @@ bool wxControl::MSWCreateControl(const wxChar *classname, if ( !m_hWnd ) { wxLogDebug(wxT("Failed to create a control of class '%s'"), classname); - wxFAIL_MSG(_T("something is very wrong")); + wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed")); - return FALSE; + return false; } #if wxUSE_CTL3D if ( want3D ) { Ctl3dSubclassCtl(GetHwnd()); - m_useCtl3D = TRUE; + m_useCtl3D = true; } #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(); + if (!m_hasFont) + SetFont(GetDefaultAttributes().font); // set the size now if no initial size specified - if ( w <= 0 || h <= 0 ) - { - SetBestSize(size); - } + SetInitialBestSize(size); - return TRUE; + return true; } +// ---------------------------------------------------------------------------- +// various accessors +// ---------------------------------------------------------------------------- + wxBorder wxControl::GetDefaultBorder() const { // we want to automatically give controls a sunken style (confusingly, @@ -167,11 +189,88 @@ wxBorder wxControl::GetDefaultBorder() const return wxBORDER_SUNKEN; } +WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + long msStyle = wxWindow::MSWGetStyle(style, exstyle); + + if ( AcceptsFocus() ) + { + msStyle |= WS_TABSTOP; + } + + return msStyle; +} + wxSize wxControl::DoGetBestSize() const { return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); } +// This is a helper for all wxControls made with UPDOWN native control. +// In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in +// WinCE of Smartphones this happens also for native wxTextCtrl, +// wxChoice and others. +wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const +{ + // take size according to layout + wxSize bestSize( +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + 0,GetCharHeight() +#else + GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL), + GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL) +#endif + ); + + // correct size as for undocumented MSW variants cases (WinCE and perhaps others) + if (bestSize.x==0) + bestSize.x = bestSize.y; + if (bestSize.y==0) + bestSize.y = bestSize.x; + + // double size according to layout + if (is_vertical) + bestSize.y *= 2; + else + bestSize.x *= 2; + + return bestSize; +} + +/* static */ wxVisualAttributes +wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + wxVisualAttributes attrs; + + // 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); @@ -182,7 +281,7 @@ bool wxControl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { - wxEventType eventType = wxEVT_NULL; + wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL); NMHDR *hdr = (NMHDR*) lParam; switch ( hdr->code ) @@ -283,25 +382,16 @@ 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. +// Call it initially with wxDefaultCoord for all values in rect. // Keep calling for other widgets, and rect will be modified // to calculate largest bounding rectangle. void wxFindMaxSize(WXHWND wnd, RECT *rect)