X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfa822b8f1736a137a4189470ec90f4b95095381..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/msw/statline.cpp?ds=sidebyside

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 7535fee4c4..a10a33176a 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statline.cpp
+// Name:        src/msw/statline.cpp
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,23 +27,15 @@
 
 #if wxUSE_STATLINE
 
-#include "wx/msw/private.h"
-#include "wx/log.h"
-
-#ifndef SS_SUNKEN
-    #define SS_SUNKEN 0x00001000L
-#endif
-
-#ifndef SS_NOTIFY
-    #define SS_NOTIFY 0x00000100L
+#ifndef WX_PRECOMP
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"
 #endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
@@ -62,18 +50,26 @@ bool wxStaticLine::Create(wxWindow *parent,
     wxSize size = AdjustSize(sizeOrig);
 
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
-    return MSWCreateControl(_T("STATIC"), _T(""), pos, size, style);
+    return MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size);
 }
 
 WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
+    // we never have border
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
     // add our default styles
-    return msStyle | SS_GRAYRECT | SS_SUNKEN | SS_NOTIFY | WS_CLIPSIBLINGS;
+    msStyle |= SS_SUNKEN | SS_NOTIFY | WS_CLIPSIBLINGS;
+#ifndef __WXWINCE__
+    msStyle |= SS_GRAYRECT ;
+#endif
+
+    return msStyle ;
 }
 
 #endif // wxUSE_STATLINE
-