Quiet cooperation between MSW and wxGL.

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 65906af29803c57e39552b1618411ef9a888275a..b96b03985eeb18960b4465fde0d7719ebf3f1acd 100644 (file)
--- 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
 
@@ -46,7 +46,61 @@
 // implementation
 // ============================================================================
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticLineStyle )
+
+wxBEGIN_FLAGS( wxStaticLineStyle )
+    // 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(wxLI_HORIZONTAL)
+    wxFLAGS_MEMBER(wxLI_VERTICAL)
+
+wxEND_FLAGS( wxStaticLineStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticLine)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxStaticLine, wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
+#endif
+
+/*
+    TODO PROPERTIES :
+        style (wxLI_HORIZONTAL)
+*/
 
 // ----------------------------------------------------------------------------
 // wxStaticLine
@@ -62,7 +116,7 @@ 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"), wxEmptyString, pos, size);
 }
@@ -76,7 +130,12 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
     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