wxButton::GetDefaultSize() fix

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 2e55df4d409ff6efa687e3e668b1c073e822c4da..55d237160d9b111da88a0bac7ff424f892a11f98 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,19 +51,23 @@ 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);
 
     wxSize sizeReal = AdjustSize(size);
 
+#ifndef WIN32
+#define SS_SUNKEN 0
+#endif
+
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         _T("STATIC"),
-                        "",
+                        _T(""),
                         WS_VISIBLE | WS_CHILD |
-                        SS_GRAYRECT | SS_SUNKEN,// | SS_ETCHEDFRAME,
+                        SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME,
                         pos.x, pos.y, sizeReal.x, sizeReal.y,
                         GetWinHwnd(parent),
                         (HMENU)m_windowId,
@@ -70,8 +77,9 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     if ( !m_hWnd )
     {
+#ifdef __WXDEBUG__        
         wxLogDebug(_T("Failed to create static control"));
-
+#endif
         return FALSE;
     }
 
@@ -79,4 +87,5 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     return TRUE;
 }
+#endif