added wxEXEC_MAKE_GROUP_LEADER (patch 535422)

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

diff --git a/src/os2/statline.cpp b/src/os2/statline.cpp
index 687c060f001420f7089965570320b2e6ab34c32f..effb7de3505bfb725eeb0410f82adc36711208b4 100644 (file)
--- a/src/os2/statline.cpp
+++ b/src/os2/statline.cpp
@@ -49,41 +49,42 @@ bool wxStaticLine::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    if (!CreateBase( pParent
-                    ,vId
-                    ,rPos
-                    ,rSize
-                    ,lStyle
-                    ,wxDefaultValidator
-                    ,rsName
-                   ))
-        return FALSE;
-
-    pParent->AddChild(this);
-
-    wxSize                          vSizeReal = AdjustSize(rSize);
+    wxSize                          vSize = AdjustSize(rSize);

 
 

-    m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent)
-                                       ,WC_STATIC
-                                       ,""
-                                       ,WS_VISIBLE | SS_TEXT | DT_VCENTER | DT_CENTER
-                                       ,rPos.x
-                                       ,rPos.y
-                                       ,vSizeReal.x
-                                       ,vSizeReal.y
-                                       ,GetWinHwnd(pParent)
-                                       ,HWND_TOP
-                                       ,(ULONG)m_windowId
-                                       ,NULL
-                                       ,NULL
-                                      );
-    if ( !m_hWnd )
-    {
-        wxLogDebug(wxT("Failed to create static control"));
+    if ( !CreateControl( pParent
+                        ,vId
+                        ,rPos
+                        ,vSize
+                        ,lStyle
+                        ,wxDefaultValidator
+                        ,rsName
+                       ))

         return FALSE;
         return FALSE;

-    }
-    SubclassWin(m_hWnd);
-    return TRUE;
+    return OS2CreateControl( _T("STATIC")
+                            ,_T("")
+                            ,rPos
+                            ,vSize
+                            ,lStyle
+                           );

 } // end of wxStaticLine::Create
 
 } // end of wxStaticLine::Create
 

+WXDWORD wxStaticLine::OS2GetStyle(
+  long                              lStyle
+, WXDWORD*                          pdwExstyle
+) const
+{
+    //
+    // We never have border
+    //
+    lStyle &= ~wxBORDER_MASK;
+    lStyle |= wxBORDER_NONE;
+
+    WXDWORD                         dwStyle = wxControl::OS2GetStyle( lStyle
+                                                                     ,pdwExstyle
+                                                                    );
+    //
+    // Add our default styles
+    //
+    return dwStyle | WS_CLIPSIBLINGS;
+}

 #endif // wxUSE_STATLINE
 #endif // wxUSE_STATLINE