Fix a number of mingw compile errors.

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

diff --git a/src/common/spinbtncmn.cpp b/src/common/spinbtncmn.cpp
index ed6848d61acbcd4844919baa62f3d13258c66df5..dbc2f8252350ce0766024b722750e121fd212c4b 100644 (file)
--- a/src/common/spinbtncmn.cpp
+++ b/src/common/spinbtncmn.cpp
@@ -1,100 +1,99 @@
-/////////////////////////////////////////////////////////////////////////////\r
-// Name:        src/common/spinbtncmn.cpp\r
-// Purpose:     wxSpinButton common code\r
-// Author:      Julian Smart\r
-// Modified by:\r
-// Created:     04/01/98\r
-// RCS-ID:      $Id: spinbutt.cpp 44657 2007-03-07 22:56:34Z VZ $\r
-// Copyright:   (c) Julian Smart\r
-// Licence:     wxWindows licence\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-// ============================================================================\r
-// declarations\r
-// ============================================================================\r
-\r
-// ----------------------------------------------------------------------------\r
-// headers\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
-#ifndef WX_PRECOMP\r
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"\r
-    #include "wx/app.h"\r
-#endif\r
-\r
-#if wxUSE_SPINBTN\r
-\r
-#include "wx/spinbutt.h"\r
-\r
-// ----------------------------------------------------------------------------\r
-// XTI\r
-// ----------------------------------------------------------------------------\r
-\r
-wxDEFINE_FLAGS( wxSpinButtonStyle )\r
-wxBEGIN_FLAGS( wxSpinButtonStyle )\r
-    // new style border flags, we put them first to\r
-    // use them for streaming out\r
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)\r
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)\r
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)\r
-    wxFLAGS_MEMBER(wxBORDER_RAISED)\r
-    wxFLAGS_MEMBER(wxBORDER_STATIC)\r
-    wxFLAGS_MEMBER(wxBORDER_NONE)\r
-\r
-    // old style border flags\r
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)\r
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)\r
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)\r
-    wxFLAGS_MEMBER(wxRAISED_BORDER)\r
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)\r
-    wxFLAGS_MEMBER(wxBORDER)\r
-\r
-    // standard window styles\r
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)\r
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)\r
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)\r
-    wxFLAGS_MEMBER(wxWANTS_CHARS)\r
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)\r
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )\r
-    wxFLAGS_MEMBER(wxVSCROLL)\r
-    wxFLAGS_MEMBER(wxHSCROLL)\r
-\r
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)\r
-    wxFLAGS_MEMBER(wxSP_VERTICAL)\r
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)\r
-    wxFLAGS_MEMBER(wxSP_WRAP)\r
-wxEND_FLAGS( wxSpinButtonStyle )\r
-\r
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbut.h")\r
-\r
-wxBEGIN_PROPERTIES_TABLE(wxSpinButton)\r
-    wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )\r
-\r
-    wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \\r
-                wxT("Helpstring"), wxT("group"))\r
-    wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, \\r
-                wxT("Helpstring"), wxT("group"))\r
-    wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, \\r
-                wxT("Helpstring"), wxT("group"))\r
-\r
-    wxPROPERTY_FLAGS( WindowStyle, wxSpinButtonStyle, long, SetWindowStyleFlag, \\r
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \\r
-                      wxT("Helpstring"), wxT("group")) // style\r
-wxEND_PROPERTIES_TABLE()\r
-\r
-wxEMPTY_HANDLERS_TABLE(wxSpinButton)\r
-\r
-wxCONSTRUCTOR_5( wxSpinButton, wxWindow*, Parent, wxWindowID, Id, \\r
-                 wxPoint, Position, wxSize, Size, long, WindowStyle )\r
-\r
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)\r
-\r
-\r
-#endif // wxUSE_SPINBTN\r
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/spinbtncmn.cpp
+// Purpose:     wxSpinButton common code
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
+#if wxUSE_SPINBTN
+
+#include "wx/spinbutt.h"
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxSpinButtonStyle )
+wxBEGIN_FLAGS( wxSpinButtonStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSP_VERTICAL)
+    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+    wxFLAGS_MEMBER(wxSP_WRAP)
+wxEND_FLAGS( wxSpinButtonStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbutt.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
+    wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
+
+    wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
+                wxT("Helpstring"), wxT("group"))
+    wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, \
+                wxT("Helpstring"), wxT("group"))
+    wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, \
+                wxT("Helpstring"), wxT("group"))
+
+    wxPROPERTY_FLAGS( WindowStyle, wxSpinButtonStyle, long, SetWindowStyleFlag, \
+                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                      wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxSpinButton)
+
+wxCONSTRUCTOR_5( wxSpinButton, wxWindow*, Parent, wxWindowID, Id, \
+                 wxPoint, Position, wxSize, Size, long, WindowStyle )
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
+
+#endif // wxUSE_SPINBTN