X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23645bfa01b6450257f140a30c87565225b1ef4a..ee92941afca091bf72d17e96ac8388545700d1fc:/src/univ/control.cpp?ds=sidebyside diff --git a/src/univ/control.cpp b/src/univ/control.cpp index fa5cdf48a8..67cadcb96f 100644 --- a/src/univ/control.cpp +++ b/src/univ/control.cpp @@ -6,17 +6,13 @@ // Created: 14.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ // declarations // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "control.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -29,9 +25,10 @@ #if wxUSE_CONTROLS +#include "wx/control.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/control.h" #include "wx/dcclient.h" #endif @@ -58,8 +55,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxControl) void wxControl::Init() { m_indexAccel = -1; - - m_inputHandler = (wxInputHandler *)NULL; } bool wxControl::Create(wxWindow *parent, @@ -70,18 +65,13 @@ bool wxControl::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { - // we use wxNO_FULL_REPAINT_ON_RESIZE by default as it results in much - // less flicker and none of the standard controls needs to be entirely - // repainted after resize anyhow - if ( !wxControlBase::Create(parent, id, pos, size, - style | wxNO_FULL_REPAINT_ON_RESIZE, - validator, name) ) + if ( !wxControlBase::Create(parent, id, pos, size, style, validator, name) ) { // underlying window creation failed? - return FALSE; + return false; } - return TRUE; + return true; } // ----------------------------------------------------------------------------