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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 7535fee4c4..ea49fcdcbb 100644
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "statline.h"
 #endif
 
@@ -47,6 +47,10 @@
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
+/*
+	TODO PROPERTIES :
+		style (wxLI_HORIZONTAL)
+*/
 
 // ----------------------------------------------------------------------------
 // wxStaticLine
@@ -64,15 +68,24 @@ bool wxStaticLine::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
-    return MSWCreateControl(_T("STATIC"), _T(""), pos, size, style);
+    return MSWCreateControl(_T("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