Fix another crash when conversion fails in Unix PostScript code.

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

diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp
index effb7de3505bfb725eeb0410f82adc36711208b4..1bda2b100821f6c744314901a148714c211b4190 100644 (file)
--- a/src/os2/statline.cpp
+++ b/src/os2/statline.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statline.cpp
+// Name:        src/os2/statline.cpp
 // Purpose:     OS2 version of wxStaticLine class
 // Author:      David Webster
 // Created:     10/23/99
-// Version:     $Id$
 // Copyright:   (c) 1999 David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,26 +15,23 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_STATLINE
+
 #include "wx/statline.h"
 
-#if wxUSE_STATLINE
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
 
 #include "wx/os2/private.h"
-#include "wx/log.h"
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
@@ -60,12 +56,26 @@ bool wxStaticLine::Create(
                         ,rsName
                        ))
         return FALSE;
-    return OS2CreateControl( _T("STATIC")
-                            ,_T("")
-                            ,rPos
-                            ,vSize
-                            ,lStyle
-                           );
+    if (!OS2CreateControl( wxT("STATIC")
+                          ,SS_FGNDFRAME
+                          ,rPos
+                          ,rSize
+                          ,rsName
+                         ))
+        return FALSE;
+
+    wxColour                        vColour;
+
+    vColour.Set(wxString(wxT("GREY")));
+
+    LONG                            lColor = (LONG)vColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_FOREGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    return TRUE;
 } // end of wxStaticLine::Create
 
 WXDWORD wxStaticLine::OS2GetStyle(