add parentheses for && inside || to fix g++ 4.3 warning

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

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index a344877e2bde55a4b73ea80c68c36f6dcbdde21a..1ee58a4b8c867543dd157eef1d5b6ebd2b8f30c5 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:


@@ -12,28 +12,27 @@
 // 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)


@@ -42,19 +41,19 @@ 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;

 
     // Used to have DT_VCENTER but that doesn't work correctly with
     // multiline strings and DT_WORDBREAK. Accept a reasonable
 
     // Used to have DT_VCENTER but that doesn't work correctly with
     // multiline strings and DT_WORDBREAK. Accept a reasonable


@@ -67,11 +66,9 @@ bool wxStaticText::Create(
     else
         lSstyle |= DT_LEFT;
 
     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)sLabel.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


@@ -81,13 +78,9 @@ 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"));

 
 

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

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


@@ -106,24 +99,23 @@ 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 );
+
+    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;
-    bool                            bLastWasTilde = FALSE;
+    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++)
     {
 
     for (const wxChar *pc = sText; ; pc++)
     {


@@ -174,7 +166,7 @@ wxSize wxStaticText::DoGetBestSize() const
             {
                 if (!bLastWasTilde)
                 {
             {
                 if (!bLastWasTilde)
                 {

-                    bLastWasTilde = TRUE;
+                    bLastWasTilde = true;

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


@@ -185,7 +177,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 //
                 // It is a literal tilde
                 //
                 //
                 // It is a literal tilde
                 //

-                bLastWasTilde = FALSE;
+                bLastWasTilde = false;

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


@@ -213,6 +205,10 @@ void wxStaticText::DoSetSize(
                                 ,nHeight
                                 ,nSizeFlags
                                );
                                 ,nHeight
                                 ,nSizeFlags
                                );

+
+    // eventually update label (if ellipsizing is on):
+    UpdateLabel();
+

     Refresh();
 } // end of wxStaticText::DoSetSize
 
     Refresh();
 } // end of wxStaticText::DoSetSize
 


@@ -237,14 +233,18 @@ void wxStaticText::SetLabel(
   const wxString&                   rsLabel
 )
 {
   const wxString&                   rsLabel
 )
 {

-    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
-    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
+    m_labelOrig = rsLabel;       // save original label
+
+    // OS/2 does not support neither ellipsize nor markup in static text:
+    DoSetLabel(rsLabel);
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());

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

-    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE))
+    if (!(GetWindowStyle() & wxST_NO_AUTORESIZE) &&
+        !IsEllipsized())

     {
         wxCoord                     vX;
         wxCoord                     vY;
     {
         wxCoord                     vX;
         wxCoord                     vY;


@@ -271,3 +271,18 @@ MRESULT wxStaticText::OS2WindowProc(
                                    ,lParam
                                   );
 } // end of wxStaticText::OS2WindowProc
                                    ,lParam
                                   );
 } // 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());
+}
+