Applied part of [ 1575767 ] Init/size/check fixes for sockets

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index c987dafbc073a46ba1081afeaf41874f590ed9de..b636f26e3dc51330d9a994a50a9767db2e7d060a 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -1,43 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticText
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxStaticText
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "stattext.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"
 

+#include "wx/stattext.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/brush.h"
-#include "wx/scrolwin.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/brush.h"
+    #include "wx/scrolwin.h"

 #endif
 
 #endif
 

-#include "wx/stattext.h"

 #include "wx/os2/private.h"
 #include <stdio.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
 #include "wx/os2/private.h"
 #include <stdio.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 

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

 {
     SetName(rsName);
     if (pParent)
 {
     SetName(rsName);
     if (pParent)


@@ -46,30 +41,36 @@ bool wxStaticText::Create(
     SetBackgroundColour(pParent->GetBackgroundColour()) ;
     SetForegroundColour(pParent->GetForegroundColour()) ;
 
     SetBackgroundColour(pParent->GetBackgroundColour()) ;
     SetForegroundColour(pParent->GetForegroundColour()) ;
 

-    if ( vId == -1 )
+    if ( vId == wxID_ANY )

         m_windowId = (int)NewControlId();
     else
         m_windowId = vId;
 
         m_windowId = (int)NewControlId();
     else
         m_windowId = vId;
 

-    int                             nX      = rPos.x;
-    int                             nY      = rPos.y;
-    int                             nWidth  = rSize.x;
-    int                             nHeight = rSize.y;
+    int nX      = rPos.x;
+    int nY      = rPos.y;
+    int nWidth  = rSize.x;
+    int nHeight = rSize.y;

 
     m_windowStyle = lStyle;
 
 
     m_windowStyle = lStyle;
 

-    long                            lSstyle = 0L;
+    long lSstyle = 0L;

 
 

-    lSstyle = WS_VISIBLE | SS_TEXT | DT_VCENTER;
+    // Used to have DT_VCENTER but that doesn't work correctly with
+    // multiline strings and DT_WORDBREAK. Accept a reasonable
+    // compromise for now
+    lSstyle = WS_VISIBLE | SS_TEXT | DT_WORDBREAK | DT_MNEMONIC;

     if (m_windowStyle & wxALIGN_CENTRE)
         lSstyle |= DT_CENTER;
     else if (m_windowStyle & wxALIGN_RIGHT)
         lSstyle |= DT_RIGHT;
     else
         lSstyle |= DT_LEFT;
     if (m_windowStyle & wxALIGN_CENTRE)
         lSstyle |= DT_CENTER;
     else if (m_windowStyle & wxALIGN_RIGHT)
         lSstyle |= DT_RIGHT;
     else
         lSstyle |= DT_LEFT;

+
+    wxString sLabel = ::wxPMTextToLabel(rsLabel);
+

     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_STATIC                // Window class
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_STATIC                // Window class

-                                       ,(PSZ)rsLabel.c_str()     // Initial Text
+                                       ,(PSZ)sLabel.c_str()      // Initial Text

                                        ,(ULONG)lSstyle           // Style flags
                                        ,0L, 0L, 0L, 0L           // Origin -- 0 size
                                        ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
                                        ,(ULONG)lSstyle           // Style flags
                                        ,0L, 0L, 0L, 0L           // Origin -- 0 size
                                        ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent


@@ -79,13 +80,9 @@ bool wxStaticText::Create(
                                        ,NULL                     // no Presentation parameters
                                       );
 
                                        ,NULL                     // no Presentation parameters
                                       );
 

-    wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create static ctrl"));
-
-    wxColour                        vColour;
+    wxCHECK_MSG(m_hWnd, false, wxT("Failed to create static ctrl"));

 
 

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

 
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
 
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR


@@ -104,24 +101,21 @@ bool wxStaticText::Create(
     SetFont(*wxSMALL_FONT);
     SetXComp(0);
     SetYComp(0);
     SetFont(*wxSMALL_FONT);
     SetXComp(0);
     SetYComp(0);

-    SetSize( nX
-            ,nY
-            ,nWidth
-            ,nHeight
-           );
-    return TRUE;
+    SetSize( nX, nY, nWidth, nHeight );
+
+    return true;

 } // end of wxStaticText::Create
 
 wxSize wxStaticText::DoGetBestSize() const
 {
 } // end of wxStaticText::Create
 
 wxSize wxStaticText::DoGetBestSize() const
 {

-    wxString                        sText(wxGetWindowText(GetHWND()));
-    int                             nWidthTextMax = 0;
-    int                             nWidthLine = 0;
-    int                             nHeightTextTotal = 0;
-    int                             nHeightLineDefault = 0;
-    int                             nHeightLine = 0;
-    wxString                        sCurLine;
-    bool                            bLastWasAmpersand = FALSE;
+    wxString sText(wxGetWindowText(GetHWND()));
+    int      nWidthTextMax = 0;
+    int      nWidthLine = 0;
+    int      nHeightTextTotal = 0;
+    int      nHeightLineDefault = 0;
+    int      nHeightLine = 0;
+    wxString sCurLine;
+    bool     bLastWasTilde = false;

 
     for (const wxChar *pc = sText; ; pc++)
     {
 
     for (const wxChar *pc = sText; ; pc++)
     {


@@ -163,16 +157,16 @@ wxSize wxStaticText::DoGetBestSize() const
         else
         {
             //
         else
         {
             //

-            // We shouldn't take into account the '&' which just introduces the
+            // We shouldn't take into account the '~' which just introduces the

             // mnemonic characters and so are not shown on the screen -- except
             // mnemonic characters and so are not shown on the screen -- except

-            // when it is preceded by another '&' in which case it stands for a
-            // literal ampersand
+            // when it is preceded by another '~' in which case it stands for a
+            // literal tilde

             //
             //

-            if (*pc == _T('&'))
+            if (*pc == _T('~'))

             {
             {

-                if (!bLastWasAmpersand)
+                if (!bLastWasTilde)

                 {
                 {

-                    bLastWasAmpersand = TRUE;
+                    bLastWasTilde = true;

 
                     //
                     // Skip the statement adding pc to curLine below
 
                     //
                     // Skip the statement adding pc to curLine below


@@ -181,9 +175,9 @@ wxSize wxStaticText::DoGetBestSize() const
                 }
 
                 //
                 }
 
                 //

-                // It is a literal ampersand
+                // It is a literal tilde

                 //
                 //

-                bLastWasAmpersand = FALSE;
+                bLastWasTilde = false;

             }
             sCurLine += *pc;
         }
             }
             sCurLine += *pc;
         }


@@ -235,7 +229,8 @@ void wxStaticText::SetLabel(
   const wxString&                   rsLabel
 )
 {
   const wxString&                   rsLabel
 )
 {

-    ::WinSetWindowText(GetHwnd(), rsLabel.c_str());
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());

 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is
 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is