X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/788722ac5ca55bd3c0d1f9bd2d598f90b3b02071..cc0bffacebe299b312ce7fdf49a8825f466cf73f:/src/msw/control.cpp?ds=sidebyside diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 689ed8f972..df2d8b1109 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -1,37 +1,39 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: msw/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "control.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "control.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_CONTROLS + #ifndef WX_PRECOMP -#include "wx/event.h" -#include "wx/app.h" -#include "wx/dcclient.h" -#include "wx/log.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/log.h" #endif #include "wx/control.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #endif @@ -44,12 +46,6 @@ END_EVENT_TABLE() // Item members wxControl::wxControl() { - m_backgroundColour = *wxWHITE; - m_foregroundColour = *wxBLACK; - -#if WXWIN_COMPATIBILITY - m_callback = 0; -#endif // WXWIN_COMPATIBILITY } wxControl::~wxControl() @@ -58,19 +54,33 @@ wxControl::~wxControl() } -bool wxControl::Create(wxWindow *parent, wxWindowID id, +bool wxControl::Create(wxWindow *parent, + wxWindowID id, const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, + const wxSize& size, + long style, + const wxValidator& wxVALIDATOR_PARAM(validator), const wxString& name) { - bool rval = wxWindow::Create(parent, id, pos, size, style, name); - if (rval) { + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) + return FALSE; + #if wxUSE_VALIDATORS - SetValidator(validator); + SetValidator(validator); #endif - } - return rval; + + return TRUE; +} + +bool wxControl::MSWCreateControl(const wxChar *classname, + const wxString& label, + const wxPoint& pos, + const wxSize& size) +{ + WXDWORD exstyle; + WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle); + + return MSWCreateControl(classname, msStyle, pos, size, label, exstyle); } bool wxControl::MSWCreateControl(const wxChar *classname, @@ -80,21 +90,30 @@ bool wxControl::MSWCreateControl(const wxChar *classname, const wxString& label, WXDWORD exstyle) { - // want3D tells us whether or not the style specified a 3D border. - // If so, under WIN16 we can use Ctl3D to give it an appropriate style. - // Sometimes want3D is used to indicate that the non-extended style should have - // WS_BORDER. - bool want3D = TRUE; - // if no extended style given, determine it ourselves if ( exstyle == (WXDWORD)-1 ) { - exstyle = GetExStyle(style, &want3D); + exstyle = 0; + (void) MSWGetStyle(GetWindowStyle(), &exstyle); } - // all controls have these styles (wxWindows creates all controls visible - // by default) - style |= WS_CHILD | WS_VISIBLE; + // all controls should have this style + style |= WS_CHILD; + + // create the control visible if it's currently shown for wxWindows + 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 ( @@ -102,8 +121,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname, classname, // the kind of control to create label, // the window name style, // the window style - pos.x, pos.y, // the window position - size.x, size.y, // and size + x, y, w, h, // the window position and size GetHwndOf(GetParent()), // parent (HMENU)GetId(), // child id wxGetInstance(), // app instance @@ -126,15 +144,29 @@ bool wxControl::MSWCreateControl(const wxChar *classname, } #endif // wxUSE_CTL3D - // subclass again for purposes of dialog editing mode + // install wxWindows window proc for this window SubclassWin(m_hWnd); // controls use the same font and colours as their parent dialog by default InheritAttributes(); + // set the size now if no initial size specified + if ( w <= 0 || h <= 0 ) + { + SetBestSize(size); + } + return TRUE; } +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; +} + wxSize wxControl::DoGetBestSize() const { return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); @@ -142,16 +174,6 @@ wxSize wxControl::DoGetBestSize() const bool wxControl::ProcessCommand(wxCommandEvent& event) { -#if WXWIN_COMPATIBILITY - if ( m_callback ) - { - (void)(*m_callback)(*this, event); - - return TRUE; - } - else -#endif // WXWIN_COMPATIBILITY - return GetEventHandler()->ProcessEvent(event); } @@ -160,10 +182,10 @@ bool wxControl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { - wxCommandEvent event(wxEVT_NULL, m_windowId); wxEventType eventType = wxEVT_NULL; - NMHDR *hdr1 = (NMHDR*) lParam; - switch ( hdr1->code ) + + NMHDR *hdr = (NMHDR*) lParam; + switch ( hdr->code ) { case NM_CLICK: eventType = wxEVT_COMMAND_LEFT_CLICK; @@ -197,6 +219,7 @@ bool wxControl::MSWOnNotify(int idCtrl, return wxWindow::MSWOnNotify(idCtrl, lParam, result); } + wxCommandEvent event(wxEVT_NULL, m_windowId); event.SetEventType(eventType); event.SetEventObject(this); @@ -216,11 +239,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), @@ -244,11 +273,6 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED #endif // wxUSE_CTL3D HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); ::SetBkColor(hdc, wxColourToRGB(colBack)); @@ -259,16 +283,16 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED return (WXHBRUSH)brush->GetResourceHandle(); } -WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const +WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const { - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D); + long msStyle = wxWindow::MSWGetStyle(style, exstyle); - // Even with extended styles, need to combine with WS_BORDER for them to - // look right. - if ( *want3D || wxStyleHasBorder(m_windowStyle) ) - style |= WS_BORDER; + if ( AcceptsFocus() ) + { + msStyle |= WS_TABSTOP; + } - return exStyle; + return msStyle; } // --------------------------------------------------------------------------- @@ -305,3 +329,4 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect) rect->bottom = bottom; } +#endif // wxUSE_CONTROLS