Committing in .

[wxWidgets.git] / src / msw / stattext.cpp

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 5248292eeaff588b209df192e28bceab91bb3762..0c89b206938081c2107f81ba5f4e295dac3729fc 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "stattext.h"
 #endif
 
@@ -33,6 +33,10 @@
 #include <stdio.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+/*
+       TODO PROPERTIES :
+               label
+*/
 
 bool wxStaticText::Create(wxWindow *parent,
                           wxWindowID id,
@@ -42,10 +46,6 @@ bool wxStaticText::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
-    // By default, a static text should have no border.
-    if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
-        style |= wxBORDER_NONE;
-
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
@@ -55,6 +55,11 @@ bool wxStaticText::Create(wxWindow *parent,
     return TRUE;
 }
 
+wxBorder wxStaticText::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);