Fix the build system in gtk, plus a couple of compilation errors. wxWebView now succe...

[wxWidgets.git] / src / common / odcombocmn.cpp

diff --git a/src/common/odcombocmn.cpp b/src/common/odcombocmn.cpp
index 1f6f5fec0921fed00e95b6e69299b0ca64d92396..2301e7eb3ed7e7246d2b57266dc9d7787b5e0ddd 100644 (file)
--- a/src/common/odcombocmn.cpp
+++ b/src/common/odcombocmn.cpp
@@ -1,55 +1,55 @@
-/////////////////////////////////////////////////////////////////////////////\r
-// Name:        src/common/odcombocmn.cpp\r
-// Purpose:     wxOwnerDrawnComboBox common code\r
-// Author:      Jaakko Salli\r
-// Modified by:\r
-// Created:     Apr-30-2006\r
-// RCS-ID:      $Id: odcombo.cpp 45397 2007-04-11 10:32:01Z MBN $\r
-// Copyright:   (c) 2005 Jaakko Salli\r
-// Licence:     wxWindows licence\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-// ============================================================================\r
-// declarations\r
-// ============================================================================\r
-\r
-// ----------------------------------------------------------------------------\r
-// headers\r
-// ----------------------------------------------------------------------------\r
-\r
-#include "wx/wxprec.h"\r
-\r
-#ifdef __BORLANDC__\r
-    #pragma hdrstop\r
-#endif\r
-\r
-#if wxUSE_ODCOMBOBOX\r
-\r
-#include "wx/odcombo.h"\r
-\r
-#ifndef WX_PRECOMP\r
-    #include "wx/log.h"\r
-    #include "wx/combobox.h"\r
-    #include "wx/dcclient.h"\r
-    #include "wx/settings.h"\r
-    #include "wx/dialog.h"\r
-#endif\r
-\r
-#include "wx/combo.h"\r
-\r
-// ----------------------------------------------------------------------------\r
-// XTI\r
-// ----------------------------------------------------------------------------\r
-\r
-wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \\r
-                               wxControlWithItems, "wx/odcombo.h")\r
-\r
-wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)\r
-wxEND_PROPERTIES_TABLE()\r
-\r
-wxEMPTY_HANDLERS_TABLE(wxOwnerDrawnComboBox)\r
-\r
-wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , \\r
-                 Id , wxString , Value , wxPoint , Position , wxSize , Size )\r
-\r
-#endif // wxUSE_ODCOMBOBOX\r
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/odcombocmn.cpp
+// Purpose:     wxOwnerDrawnComboBox common code
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     Apr-30-2006
+// RCS-ID:      $Id$
+// Copyright:   (c) 2005 Jaakko Salli
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ODCOMBOBOX
+
+#include "wx/odcombo.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/combobox.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/dialog.h"
+#endif
+
+#include "wx/combo.h"
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxIMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, \
+                               wxControlWithItems, "wx/odcombo.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxOwnerDrawnComboBox)
+
+wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , \
+                 Id , wxString , Value , wxPoint , Position , wxSize , Size )
+
+#endif // wxUSE_ODCOMBOBOX