applied patch 1683441

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

diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp
index cd3343c3be9eb2f2ff24154cfaf921e209d81024..e9663eebf90f92d0634f2b7436f33c57b26d51a8 100644 (file)
--- a/src/os2/statline.cpp
+++ b/src/os2/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/statline.cpp
+// Name:        src/os2/statline.cpp

 // Purpose:     OS2 version of wxStaticLine class
 // Author:      David Webster
 // Created:     10/23/99
 // Purpose:     OS2 version of wxStaticLine class
 // Author:      David Webster
 // Created:     10/23/99


@@ -16,19 +16,18 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 
 #include "wx/statline.h"
 

-#if wxUSE_STATLINE
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 #include "wx/os2/private.h"
 
 #include "wx/os2/private.h"

-#include "wx/log.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -60,7 +59,7 @@ bool wxStaticLine::Create(
                         ,rsName
                        ))
         return FALSE;
                         ,rsName
                        ))
         return FALSE;

-    if (!OS2CreateControl( "STATIC"
+    if (!OS2CreateControl( wxT("STATIC")

                           ,SS_FGNDFRAME
                           ,rPos
                           ,rSize
                           ,SS_FGNDFRAME
                           ,rPos
                           ,rSize


@@ -70,7 +69,7 @@ bool wxStaticLine::Create(
 
     wxColour                        vColour;
 
 
     wxColour                        vColour;
 

-    vColour.Set(wxString("GREY"));
+    vColour.Set(wxString(wxT("GREY")));

 
     LONG                            lColor = (LONG)vColour.GetPixel();
 
 
     LONG                            lColor = (LONG)vColour.GetPixel();