Allow passing multi-line strings to wxDC::DrawText(), even under MSW.

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 1142b348f042938262d7974b179d0b8d2e2ba2d1..8ae9f4d7ab86a0f47a8d5dbadc3a5b64b8aa787c 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -1,38 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.cpp
+// Name:        src/os2/statbox.cpp

 // Purpose:     wxStaticBox
 // Author:      David Webster
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxStaticBox
 // Author:      David Webster
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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

-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/statbox.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#include "wx/app.h"
-#include "wx/dcclient.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/statbox.h"
+#include "wx/os2/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 

-bool wxStaticBox::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsLabel
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxString&                   rsName
-)
+bool wxStaticBox::Create( wxWindow*       pParent,
+                          wxWindowID      vId,
+                          const wxString& rsLabel,
+                          const wxPoint&  rPos,
+                          const wxSize&   rSize,
+                          long            lStyle,
+                          const wxString& rsName )

 {
     if(!CreateControl( pParent
                       ,vId
 {
     if(!CreateControl( pParent
                       ,vId


@@ -43,20 +41,20 @@ bool wxStaticBox::Create(
                       ,rsName
                      ))
     {
                       ,rsName
                      ))
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    wxPoint                         vPos(0,0);
-    wxSize                          vSize(0,0);
+    wxPoint  vPos(0,0);
+    wxSize   vSize(0,0);

 
 

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

                           ,SS_GROUPBOX
                           ,vPos
                           ,vSize
                           ,rsLabel
                          ))
     {
                           ,SS_GROUPBOX
                           ,vPos
                           ,vSize
                           ,rsLabel
                          ))
     {

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -64,31 +62,25 @@ bool wxStaticBox::Create(
     //
     SetBackgroundColour(GetParent()->GetBackgroundColour());
 
     //
     SetBackgroundColour(GetParent()->GetBackgroundColour());
 

-    wxColour                        vColour;
-
-    vColour.Set(wxString("BLACK"));
-
-    LONG                            lColor = (LONG)vColour.GetPixel();
-
+    LONG lColor = (LONG)wxBLACK->GetPixel();

     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    lColor = (LONG)m_backgroundColour.GetPixel();

 
 

+    lColor = (LONG)m_backgroundColour.GetPixel();

     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    SetFont(*wxSMALL_FONT);

     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );

-    return TRUE;
+    return true;

 } // end of wxStaticBox::Create
 
 wxSize wxStaticBox::DoGetBestSize() const
 } // end of wxStaticBox::Create
 
 wxSize wxStaticBox::DoGetBestSize() const


@@ -97,14 +89,11 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCy;
     int                             wBox;
 
     int                             nCy;
     int                             wBox;
 

-    wxGetCharSize( GetHWND()
-                  ,&nCx
-                  ,&nCy
-                  ,(wxFont*)&GetFont()
-                 );
+    nCx = GetCharWidth();
+    nCy = GetCharHeight();

     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox

-                  ,&nCy
+                  ,NULL

                  );
     wBox += 3 * nCx;
 
                  );
     wBox += 3 * nCx;
 


@@ -115,13 +104,9 @@ wxSize wxStaticBox::DoGetBestSize() const
                  );
 } // end of wxStaticBox::DoGetBestSize
 
                  );
 } // end of wxStaticBox::DoGetBestSize
 

-MRESULT wxStaticBox::OS2WindowProc(
-  WXUINT                            nMsg
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+MRESULT wxStaticBox::OS2WindowProc( WXUINT    nMsg,
+                                    WXWPARAM  wParam,
+                                    WXLPARAM  lParam )

 {
     return wxControl::OS2WindowProc(nMsg, wParam, lParam);
 } // end of wxStaticBox::OS2WindowProc
 {
     return wxControl::OS2WindowProc(nMsg, wParam, lParam);
 } // end of wxStaticBox::OS2WindowProc

-
-