make --static flag act on --cppflags too.

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 2e55df4d409ff6efa687e3e668b1c073e822c4da..2bf14042af379e9fe41b3e5bdcb51d9306abab97 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -29,7 +29,18 @@
 
 #include "wx/statline.h"
 
 
 #include "wx/statline.h"
 

+#if wxUSE_STATLINE
+

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/log.h"
+
+#ifndef SS_SUNKEN
+    #define SS_SUNKEN 0x00001000L
+#endif
+
+#ifndef SS_NOTIFY
+    #define SS_NOTIFY 0x00000100L
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -48,19 +59,24 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

         return FALSE;
 
     parent->AddChild(this);
 
     wxSize sizeReal = AdjustSize(size);
 
         return FALSE;
 
     parent->AddChild(this);
 
     wxSize sizeReal = AdjustSize(size);
 

+    DWORD wstyle = WS_CHILD | WS_VISIBLE | SS_GRAYRECT | SS_SUNKEN | SS_NOTIFY;
+
+    if ( style & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+
+

     m_hWnd = (WXHWND)::CreateWindow
                        (
     m_hWnd = (WXHWND)::CreateWindow
                        (

-                        _T("STATIC"),
-                        "",
-                        WS_VISIBLE | WS_CHILD |
-                        SS_GRAYRECT | SS_SUNKEN,// | SS_ETCHEDFRAME,
+                        wxT("STATIC"),
+                        wxT(""),
+                        wstyle,

                         pos.x, pos.y, sizeReal.x, sizeReal.y,
                         GetWinHwnd(parent),
                         (HMENU)m_windowId,
                         pos.x, pos.y, sizeReal.x, sizeReal.y,
                         GetWinHwnd(parent),
                         (HMENU)m_windowId,


@@ -70,7 +86,7 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-        wxLogDebug(_T("Failed to create static control"));
+        wxLogDebug(wxT("Failed to create static control"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -80,3 +96,5 @@ bool wxStaticLine::Create( wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // wxUSE_STATLINE
+