X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d772832a04a3d2380ac6b3ffea6bfe6a72dcff6..f87dfa063a99be8aae8de5c70c5dce21cf930283:/src/msw/control.cpp?ds=sidebyside diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 0a177e8d69..930d7542ce 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: msw/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: @@ -10,28 +10,31 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "control.h" + #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/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__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) -#include +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) + #include #endif IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) @@ -43,9 +46,6 @@ END_EVENT_TABLE() // Item members wxControl::wxControl() { - m_backgroundColour = *wxWHITE; - m_foregroundColour = *wxBLACK; - #if WXWIN_COMPATIBILITY m_callback = 0; #endif // WXWIN_COMPATIBILITY @@ -57,21 +57,34 @@ wxControl::~wxControl() } -bool wxControl::Create(wxWindow *parent, wxWindowID id, +bool wxControl::Create(wxWindow *parent, + wxWindowID id, const wxPoint& pos, - const wxSize& size, long style, -#if wxUSE_VALIDATORS + const wxSize& size, + long style, const wxValidator& validator, -#endif 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, + long style) +{ + WXDWORD exstyle; + WXDWORD msStyle = MSWGetStyle(style, &exstyle); + + return MSWCreateControl(classname, msStyle, pos, size, label, exstyle); } bool wxControl::MSWCreateControl(const wxChar *classname, @@ -81,28 +94,34 @@ bool wxControl::MSWCreateControl(const wxChar *classname, 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; + // 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 = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); } - // all controls have these childs (wxWindows creates all controls visible - // by default) + // all controls should have these styles (wxWindows creates all controls + // visible by default) style |= WS_CHILD | WS_VISIBLE; + 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; + m_hWnd = (WXHWND)::CreateWindowEx ( exstyle, // extended style 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 @@ -111,9 +130,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname, if ( !m_hWnd ) { -#ifdef __WXDEBUG__ - wxLogError(wxT("Failed to create a control of class '%s'"), classname); -#endif // DEBUG + wxLogDebug(wxT("Failed to create a control of class '%s'"), classname); + wxFAIL_MSG(_T("something is very wrong")); return FALSE; } @@ -126,12 +144,18 @@ 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; } @@ -145,7 +169,7 @@ bool wxControl::ProcessCommand(wxCommandEvent& event) #if WXWIN_COMPATIBILITY if ( m_callback ) { - (void)(*m_callback)(this, event); + (void)(*m_callback)(*this, event); return TRUE; } @@ -160,10 +184,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 +221,7 @@ bool wxControl::MSWOnNotify(int idCtrl, return wxWindow::MSWOnNotify(idCtrl, lParam, result); } + wxCommandEvent event(wxEVT_NULL, m_windowId); event.SetEventType(eventType); event.SetEventObject(this); @@ -206,10 +231,9 @@ bool wxControl::MSWOnNotify(int idCtrl, void wxControl::OnEraseBackground(wxEraseEvent& event) { - // In general, you don't want to erase the background of a control, - // or you'll get a flicker. - // TODO: move this 'null' function into each control that - // might flicker. + // notice that this 'dumb' implementation may cause flicker for some of the + // controls in which case they should intercept wxEraseEvent and process it + // themselves somehow RECT rect; ::GetClientRect(GetHwnd(), &rect); @@ -224,10 +248,17 @@ void wxControl::OnEraseBackground(wxEraseEvent& event) ::SetMapMode(hdc, mode); } -WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, +WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), +#if wxUSE_CTL3D WXUINT message, WXWPARAM wParam, - WXLPARAM lParam) + WXLPARAM lParam +#else + WXUINT WXUNUSED(message), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam) +#endif + ) { #if wxUSE_CTL3D if ( m_useCtl3D ) @@ -243,7 +274,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, else SetBkMode(hdc, OPAQUE); - const wxColour& colBack = GetBackgroundColour(); + wxColour colBack = GetBackgroundColour(); + ::SetBkColor(hdc, wxColourToRGB(colBack)); ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); @@ -252,16 +284,16 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, 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; } // --------------------------------------------------------------------------- @@ -298,3 +330,4 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect) rect->bottom = bottom; } +#endif // wxUSE_CONTROLS