remove unused private member m_ordered from wxDataViewVirtualListModel

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 141ccf59a3e5a5dd75d07e1a9e18fb8c4bee2717..3e11757d3886900f6d9d6a68d6907a7fa04e2771 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:
 // Purpose:     wxStaticText
 // Author:      David Webster
 // Modified by:


@@ -9,34 +9,28 @@
 // Licence:     wxWindows 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/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>
 
 #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)


@@ -45,30 +39,34 @@ 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;

+

     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
+                                       ,NULL                     // 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


@@ -78,25 +76,46 @@ bool wxStaticText::Create(
                                        ,NULL                     // no Presentation parameters
                                       );
 
                                        ,NULL                     // no Presentation parameters
                                       );
 

-    wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create static ctrl"));
+    wxCHECK_MSG(m_hWnd, false, wxT("Failed to create static ctrl"));
+
+    LONG lColor = (LONG)wxBLACK->GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_FOREGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );

 
     SubclassWin(m_hWnd);
 
     SubclassWin(m_hWnd);

-    wxControl::SetFont(pParent->GetFont());
-    SetSize(nX, nY, nWidth, nHeight);
-    return FALSE;
+    SetFont(*wxSMALL_FONT);
+    SetXComp(0);
+    SetYComp(0);
+    SetSize( nX, nY, nWidth, nHeight );
+
+    SetLabel(rsLabel);
+
+    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;
-
-    for ( const wxChar *pc = sText; ; pc++ )
+    wxString sText(GetLabel());
+    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++)

     {
         if ( *pc == wxT('\n') || *pc == wxT('\0') )
         {
     {
         if ( *pc == wxT('\n') || *pc == wxT('\0') )
         {


@@ -110,7 +129,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 if (!nHeightLineDefault)
                     nHeightLineDefault = nHeightLine;
                 if (!nHeightLineDefault)
                 if (!nHeightLineDefault)
                     nHeightLineDefault = nHeightLine;
                 if (!nHeightLineDefault)

-                    GetTextExtent(_T("W"), NULL, &nHeightLineDefault);
+                    GetTextExtent(wxT("W"), NULL, &nHeightLineDefault);

                 nHeightTextTotal += nHeightLineDefault;
             }
             else
                 nHeightTextTotal += nHeightLineDefault;
             }
             else


@@ -135,6 +154,29 @@ wxSize wxStaticText::DoGetBestSize() const
         }
         else
         {
         }
         else
         {

+            //
+            // We shouldn't take into account the '~' which just introduces the
+            // 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 tilde
+            //
+            if (*pc == wxT('~'))
+            {
+                if (!bLastWasTilde)
+                {
+                    bLastWasTilde = true;
+
+                    //
+                    // Skip the statement adding pc to curLine below
+                    //
+                    continue;
+                }
+
+                //
+                // It is a literal tilde
+                //
+                bLastWasTilde = false;
+            }

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


@@ -143,22 +185,30 @@ wxSize wxStaticText::DoGetBestSize() const
                  );
 } // end of wxStaticText::DoGetBestSize
 
                  );
 } // end of wxStaticText::DoGetBestSize
 

-void wxStaticText::SetLabel(
-  const wxString&                   rsLabel
+void wxStaticText::DoSetSize(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, int                               nSizeFlags

 )
 {
 )
 {

-    ::WinSetWindowText(GetHwnd(), rsLabel.c_str());
-

     //
     //

-    // Adjust the size of the window to fit to the label unless autoresizing is
-    // disabled
+    // We need to refresh the window after changing its size as the standard
+    // control doesn't always update itself properly.

     //
     //

-    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE))
-    {
-        DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
-    }
-    DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
-} // end of wxStaticText::SetLabel
+    wxStaticTextBase::DoSetSize( nX
+                                ,nY
+                                ,nWidth
+                                ,nHeight
+                                ,nSizeFlags
+                               );
+
+    // eventually update label (if ellipsizing is on):
+    UpdateLabel();
+
+    Refresh();
+} // end of wxStaticText::DoSetSize

 
 bool wxStaticText::SetFont(
   const wxFont&                     rFont
 
 bool wxStaticText::SetFont(
   const wxFont&                     rFont


@@ -177,6 +227,36 @@ bool wxStaticText::SetFont(
     return bRet;
 } // end of wxStaticText::SetFont
 
     return bRet;
 } // end of wxStaticText::SetFont
 

+void wxStaticText::SetLabel(
+  const wxString&                   rsLabel
+)
+{
+    m_labelOrig = rsLabel;       // save original label
+
+    // OS/2 does not support ellipsized labels in static text:
+    DoSetLabel(GetEllipsizedLabel());
+
+    //
+    // Adjust the size of the window to fit to the label unless autoresizing is
+    // disabled
+    //
+    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE) &&
+        !IsEllipsized())
+    {
+        wxCoord                     vX;
+        wxCoord                     vY;
+        wxCoord                     vWidth;
+        wxCoord                     vHeight;
+
+        GetPosition(&vX, &vY);
+        GetSize(&vWidth, &vHeight);
+        if (!(vX == -1 && vY == -1 && vWidth == -1 && vHeight == -1))
+            DoSetSize(vX, vY, vWidth, vHeight, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+        else
+            DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+    }
+} // end of wxStaticText::SetLabel
+

 MRESULT wxStaticText::OS2WindowProc(
   WXUINT                            uMsg
 , WXWPARAM                          wParam
 MRESULT wxStaticText::OS2WindowProc(
   WXUINT                            uMsg
 , WXWPARAM                          wParam


@@ -190,3 +270,16 @@ MRESULT wxStaticText::OS2WindowProc(
 } // end of wxStaticText::OS2WindowProc
 
 
 } // end of wxStaticText::OS2WindowProc
 
 

+// for wxST_ELLIPSIZE_* support:
+
+void wxStaticText::DoSetLabel(const wxString& str)
+{
+    wxString sLabel = ::wxPMTextToLabel(str);
+    ::WinSetWindowText(GetHwnd(), sLabel.c_str());
+}
+
+wxString wxStaticText::DoGetLabel() const
+{
+    return wxGetWindowText(GetHwnd());
+}
+