capture mouse to be notified when it exists the popup rect (bug 1372228)

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 66e40729973eefba7733aae2c68b6f0fde8a88b4..b636f26e3dc51330d9a994a50a9767db2e7d060a 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/os2/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      David Webster
 // Modified by:
@@ -12,28 +12,27 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/stattext.h"
+
 #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
 
-#include "wx/stattext.h"
 #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)
@@ -42,21 +41,24 @@ bool wxStaticText::Create(
     SetBackgroundColour(pParent->GetBackgroundColour()) ;
     SetForegroundColour(pParent->GetForegroundColour()) ;
 
-    if ( vId == -1 )
+    if ( vId == wxID_ANY )
         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;
 
-    long                            lSstyle = 0L;
+    long lSstyle = 0L;
 
-    lSstyle = WS_VISIBLE | SS_TEXT | DT_VCENTER | DT_MNEMONIC;
+    // 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)
@@ -64,7 +66,7 @@ bool wxStaticText::Create(
     else
         lSstyle |= DT_LEFT;
 
-    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+    wxString sLabel = ::wxPMTextToLabel(rsLabel);
 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_STATIC                // Window class
@@ -78,13 +80,9 @@ bool wxStaticText::Create(
                                        ,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(wxT("BLACK")));
-
-    LONG                            lColor = (LONG)vColour.GetPixel();
+    LONG lColor = (LONG)wxBLACK->GetPixel();
 
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
@@ -103,24 +101,21 @@ bool wxStaticText::Create(
     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
 {
-    wxString                        sText(wxGetWindowText(GetHWND()));
-    int                             nWidthTextMax = 0;
-    int                             nWidthLine = 0;
-    int                             nHeightTextTotal = 0;
-    int                             nHeightLineDefault = 0;
-    int                             nHeightLine = 0;
-    wxString                        sCurLine;
-    bool                            bLastWasTilde = 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++)
     {
@@ -171,7 +166,7 @@ wxSize wxStaticText::DoGetBestSize() const
             {
                 if (!bLastWasTilde)
                 {
-                    bLastWasTilde = TRUE;
+                    bLastWasTilde = true;
 
                     //
                     // Skip the statement adding pc to curLine below
@@ -182,7 +177,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 //
                 // It is a literal tilde
                 //
-                bLastWasTilde = FALSE;
+                bLastWasTilde = false;
             }
             sCurLine += *pc;
         }