fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index bbf331ac854eb3610c9c8fc8a1c477a3a32d4004..2bf14042af379e9fe41b3e5bdcb51d9306abab97 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -34,6 +34,14 @@
 #include "wx/msw/private.h"
 #include "wx/log.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
 // ============================================================================


@@ -51,23 +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);
 

-#ifndef WIN32
-#define SS_SUNKEN 0
-#endif
+    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"),
-                        _T(""),
-                        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,


@@ -77,9 +86,8 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-#ifdef __WXDEBUG__        
-        wxLogDebug(_T("Failed to create static control"));
-#endif
+        wxLogDebug(wxT("Failed to create static control"));
+

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -87,5 +95,6 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     return TRUE;
 }
 
     return TRUE;
 }

-#endif
+
+#endif // wxUSE_STATLINE