Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 5737b15039cae213a1355ef37d1e6aa230df0f98..75bc183dc88ea4994d476f5491bba0a5ad9bd239 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -29,7 +29,10 @@
 
 #include "wx/statline.h"
 
+#if wxUSE_STATLINE
+
 #include "wx/msw/private.h"
+#include "wx/log.h"
 
 // ============================================================================
 // implementation
@@ -48,7 +51,7 @@ bool wxStaticLine::Create( wxWindow *parent,
                            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);
@@ -61,8 +64,8 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
-                        _T("STATIC"),
-                        "",
+                        wxT("STATIC"),
+                        wxT(""),
                         WS_VISIBLE | WS_CHILD |
                         SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
                         pos.x, pos.y, sizeReal.x, sizeReal.y,
@@ -74,8 +77,9 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     if ( !m_hWnd )
     {
-        wxLogDebug(_T("Failed to create static control"));
-
+#ifdef __WXDEBUG__        
+        wxLogDebug(wxT("Failed to create static control"));
+#endif
         return FALSE;
     }
 
@@ -83,4 +87,5 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     return TRUE;
 }
+#endif