was missing in xti merge

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

diff --git a/src/common/statbmpcmn.cpp b/src/common/statbmpcmn.cpp
index acc10b342b59bad0955847bfb94d659f9de58a47..0b51444db8cfef792167ffc97a14fc3404a71d12 100644 (file)
--- a/src/common/statbmpcmn.cpp
+++ b/src/common/statbmpcmn.cpp
@@ -1,85 +1,85 @@
-/////////////////////////////////////////////////////////////////////////////\r
-// Name:        src/common/statbmpcmn.cpp\r
-// Purpose:     wxStaticBitmap common code\r
-// Author:      Julian Smart\r
-// Modified by:\r
-// Created:     04/01/98\r
-// RCS-ID:      $Id: statbmp.cpp 42816 2006-10-31 08:50:17Z RD $\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
-#if wxUSE_STATBMP\r
-\r
-#include "wx/statbmp.h"\r
-\r
-// ---------------------------------------------------------------------------\r
-// XTI\r
-// ---------------------------------------------------------------------------\r
-\r
-wxDEFINE_FLAGS( wxStaticBitmapStyle )\r
-wxBEGIN_FLAGS( wxStaticBitmapStyle )\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
-wxEND_FLAGS( wxStaticBitmapStyle )\r
-\r
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h")\r
-\r
-wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)\r
-    wxPROPERTY_FLAGS( WindowStyle, wxStaticBitmapStyle, long, \\r
-                      SetWindowStyleFlag, GetWindowStyleFlag, \\r
-                      wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \\r
-                      wxT("group")) // style\r
-wxEND_PROPERTIES_TABLE()\r
-\r
-wxEMPTY_HANDLERS_TABLE(wxStaticBitmap)\r
-\r
-wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow*, Parent, wxWindowID, Id, \\r
-                 wxBitmap, Bitmap, wxPoint, Position, wxSize, Size )\r
-\r
-/*\r
-    TODO PROPERTIES :\r
-        bitmap\r
-*/\r
-\r
-#endif // wxUSE_STATBMP\r
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/statbmpcmn.cpp
+// Purpose:     wxStaticBitmap 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
+
+#if wxUSE_STATBMP
+
+#include "wx/statbmp.h"
+
+// ---------------------------------------------------------------------------
+// XTI
+// ---------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxStaticBitmapStyle )
+wxBEGIN_FLAGS( wxStaticBitmapStyle )
+    // 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)
+
+wxEND_FLAGS( wxStaticBitmapStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
+    wxPROPERTY_FLAGS( WindowStyle, wxStaticBitmapStyle, long, \
+                      SetWindowStyleFlag, GetWindowStyleFlag, \
+                      wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
+                      wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxStaticBitmap)
+
+wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow*, Parent, wxWindowID, Id, \
+                 wxBitmap, Bitmap, wxPoint, Position, wxSize, Size )
+
+/*
+    TODO PROPERTIES :
+        bitmap
+*/
+
+#endif // wxUSE_STATBMP