fix preprocessor expression, closes #12822

[wxWidgets.git] / src / xrc / xh_comboctrl.cpp

diff --git a/src/xrc/xh_comboctrl.cpp b/src/xrc/xh_comboctrl.cpp
index 162ce708ab910305a4c066db9fabe2ad6a6fa2af..29be3e775d84607e61a1c32040d06673aac088a4 100644 (file)
--- a/src/xrc/xh_comboctrl.cpp
+++ b/src/xrc/xh_comboctrl.cpp
@@ -1,69 +1,69 @@
-/////////////////////////////////////////////////////////////////////////////\r
-// Name:        src/xrc/xh_comboctrl.cpp\r
-// Purpose:     XRC resource for wxComboCtrl\r
-// Author:      Jaakko Salli\r
-// Created:     2009/01/25\r
-// RCS-ID:      $Id$\r
-// Copyright:   (c) 2009 Jaakko Salli\r
-// Licence:     wxWindows licence\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-// For compilers that support precompilation, includes "wx.h".\r
-#include "wx/wxprec.h"\r
-\r
-#ifdef __BORLANDC__\r
-    #pragma hdrstop\r
-#endif\r
-\r
-#if wxUSE_XRC && wxUSE_COMBOCTRL\r
-\r
-#include "wx/xrc/xh_comboctrl.h"\r
-\r
-#ifndef WX_PRECOMP\r
-    #include "wx/intl.h"\r
-    #include "wx/textctrl.h"    // for wxTE_PROCESS_ENTER\r
-#endif\r
-\r
-#include "wx/combo.h"\r
-\r
-\r
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler)\r
-\r
-wxComboCtrlXmlHandler::wxComboCtrlXmlHandler()\r
-                     : wxXmlResourceHandler()\r
-{\r
-    XRC_ADD_STYLE(wxCB_SORT);\r
-    XRC_ADD_STYLE(wxCB_READONLY);\r
-    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);\r
-    XRC_ADD_STYLE(wxCC_SPECIAL_DCLICK);\r
-    XRC_ADD_STYLE(wxCC_STD_BUTTON);\r
-    AddWindowStyles();\r
-}\r
-\r
-wxObject *wxComboCtrlXmlHandler::DoCreateResource()\r
-{\r
-    if( m_class == wxT("wxComboCtrl"))\r
-    {\r
-        XRC_MAKE_INSTANCE(control, wxComboCtrl)\r
-\r
-        control->Create(m_parentAsWindow,\r
-                        GetID(),\r
-                        GetText(wxT("value")),\r
-                        GetPosition(), GetSize(),\r
-                        GetStyle(),\r
-                        wxDefaultValidator,\r
-                        GetName());\r
-\r
-        SetupWindow(control);\r
-\r
-        return control;\r
-    }\r
-    return NULL;\r
-}\r
-\r
-bool wxComboCtrlXmlHandler::CanHandle(wxXmlNode *node)\r
-{\r
-    return IsOfClass(node, wxT("wxComboCtrl"));\r
-}\r
-\r
-#endif // wxUSE_XRC && wxUSE_COMBOBOX\r
+/////////////////////////////////////////////////////////////////////////////
+// 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