From 20072d3fc4b681c559a3b2e731e39eb2d4ab54a0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 20 Mar 2009 18:25:13 +0000 Subject: [PATCH] Use native EOL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xh_comboctrl.h | 64 ++++++++-------- src/xrc/xh_comboctrl.cpp | 138 +++++++++++++++++----------------- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/include/wx/xrc/xh_comboctrl.h b/include/wx/xrc/xh_comboctrl.h index d70a47355a..a3fce8dec0 100644 --- a/include/wx/xrc/xh_comboctrl.h +++ b/include/wx/xrc/xh_comboctrl.h @@ -1,32 +1,32 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/xrc/xh_comboctrl.h -// Purpose: XML resource handler for wxComboBox -// Author: Jaakko Salli -// Created: 2009/01/25 -// RCS-ID: $Id$ -// Copyright: (c) 2009 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_XH_COMBOCTRL_H_ -#define _WX_XH_COMBOCTRL_H_ - -#include "wx/xrc/xmlres.h" - -#if wxUSE_XRC && wxUSE_COMBOCTRL - -class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler -{ - DECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler) - -public: - wxComboCtrlXmlHandler(); - virtual wxObject *DoCreateResource(); - virtual bool CanHandle(wxXmlNode *node); - -private: -}; - -#endif // wxUSE_XRC && wxUSE_COMBOCTRL - -#endif // _WX_XH_COMBOCTRL_H_ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/xrc/xh_comboctrl.h +// Purpose: XML resource handler for wxComboBox +// Author: Jaakko Salli +// Created: 2009/01/25 +// RCS-ID: $Id$ +// Copyright: (c) 2009 Jaakko Salli +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_COMBOCTRL_H_ +#define _WX_XH_COMBOCTRL_H_ + +#include "wx/xrc/xmlres.h" + +#if wxUSE_XRC && wxUSE_COMBOCTRL + +class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler +{ + DECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler) + +public: + wxComboCtrlXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); + +private: +}; + +#endif // wxUSE_XRC && wxUSE_COMBOCTRL + +#endif // _WX_XH_COMBOCTRL_H_ diff --git a/src/xrc/xh_comboctrl.cpp b/src/xrc/xh_comboctrl.cpp index 162ce708ab..29be3e775d 100644 --- a/src/xrc/xh_comboctrl.cpp +++ b/src/xrc/xh_comboctrl.cpp @@ -1,69 +1,69 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/xrc/xh_comboctrl.cpp -// Purpose: XRC resource for wxComboCtrl -// Author: Jaakko Salli -// Created: 2009/01/25 -// RCS-ID: $Id$ -// Copyright: (c) 2009 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_XRC && wxUSE_COMBOCTRL - -#include "wx/xrc/xh_comboctrl.h" - -#ifndef WX_PRECOMP - #include "wx/intl.h" - #include "wx/textctrl.h" // for wxTE_PROCESS_ENTER -#endif - -#include "wx/combo.h" - - -IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler) - -wxComboCtrlXmlHandler::wxComboCtrlXmlHandler() - : wxXmlResourceHandler() -{ - XRC_ADD_STYLE(wxCB_SORT); - XRC_ADD_STYLE(wxCB_READONLY); - XRC_ADD_STYLE(wxTE_PROCESS_ENTER); - XRC_ADD_STYLE(wxCC_SPECIAL_DCLICK); - XRC_ADD_STYLE(wxCC_STD_BUTTON); - AddWindowStyles(); -} - -wxObject *wxComboCtrlXmlHandler::DoCreateResource() -{ - if( m_class == wxT("wxComboCtrl")) - { - XRC_MAKE_INSTANCE(control, wxComboCtrl) - - control->Create(m_parentAsWindow, - GetID(), - GetText(wxT("value")), - GetPosition(), GetSize(), - GetStyle(), - wxDefaultValidator, - GetName()); - - SetupWindow(control); - - return control; - } - return NULL; -} - -bool wxComboCtrlXmlHandler::CanHandle(wxXmlNode *node) -{ - return IsOfClass(node, wxT("wxComboCtrl")); -} - -#endif // wxUSE_XRC && wxUSE_COMBOBOX +///////////////////////////////////////////////////////////////////////////// +// Name: src/xrc/xh_comboctrl.cpp +// Purpose: XRC resource for wxComboCtrl +// Author: Jaakko Salli +// Created: 2009/01/25 +// RCS-ID: $Id$ +// Copyright: (c) 2009 Jaakko Salli +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_XRC && wxUSE_COMBOCTRL + +#include "wx/xrc/xh_comboctrl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/textctrl.h" // for wxTE_PROCESS_ENTER +#endif + +#include "wx/combo.h" + + +IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler) + +wxComboCtrlXmlHandler::wxComboCtrlXmlHandler() + : wxXmlResourceHandler() +{ + XRC_ADD_STYLE(wxCB_SORT); + XRC_ADD_STYLE(wxCB_READONLY); + XRC_ADD_STYLE(wxTE_PROCESS_ENTER); + XRC_ADD_STYLE(wxCC_SPECIAL_DCLICK); + XRC_ADD_STYLE(wxCC_STD_BUTTON); + AddWindowStyles(); +} + +wxObject *wxComboCtrlXmlHandler::DoCreateResource() +{ + if( m_class == wxT("wxComboCtrl")) + { + XRC_MAKE_INSTANCE(control, wxComboCtrl) + + control->Create(m_parentAsWindow, + GetID(), + GetText(wxT("value")), + GetPosition(), GetSize(), + GetStyle(), + wxDefaultValidator, + GetName()); + + SetupWindow(control); + + return control; + } + return NULL; +} + +bool wxComboCtrlXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxT("wxComboCtrl")); +} + +#endif // wxUSE_XRC && wxUSE_COMBOBOX -- 2.45.2