fixed wxListCtrl::EditLabel for MSW (ListView_EditLabel fails if

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index d6ad57770d2594e5a3004c1dac1fd45ee33bcb14..605153f40d4e185595d34c9d192ad60c9e9252e9 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,19 @@ 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
-

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

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

                         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 +81,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 +90,6 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     return TRUE;
 }
 
     return TRUE;
 }

-#endif
+
+#endif // wxUSE_STATLINE