disable workaround for lack of alpha support in native static bitmap control for...

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 124d9e471d935eddd112a910b0a6849d9f7c6360..a3b52cac708b295275d8efa28bcc9182565aa9ea 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
 


@@ -22,6 +18,8 @@
 
 #if wxUSE_STATTEXT
 
 
 #if wxUSE_STATTEXT
 

+#include "wx/stattext.h"
+

 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"


@@ -30,7 +28,6 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#include "wx/stattext.h"

 #include "wx/msw/private.h"
 
 #if wxUSE_EXTENDED_RTTI
 #include "wx/msw/private.h"
 
 #if wxUSE_EXTENDED_RTTI


@@ -103,11 +100,6 @@ bool wxStaticText::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxStaticText::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);


@@ -123,6 +115,21 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
     else
         msStyle |= SS_LEFT;
 
     else
         msStyle |= SS_LEFT;
 

+#ifdef SS_ENDELLIPSIS
+    // this style is necessary to receive mouse events
+    // Win NT and later have the SS_ENDELLIPSIS style which is useful to us:
+    if (wxGetOsVersion() == wxOS_WINDOWS_NT)
+    {
+        // for now, add the SS_ENDELLIPSIS style if wxST_ELLIPSIZE_END is given;
+        // we may need to remove it later in ::SetLabel() if the given label
+        // has newlines
+        if ( style & wxST_ELLIPSIZE_END )
+            msStyle |= SS_ENDELLIPSIS;
+    }
+#endif // SS_ENDELLIPSIS
+
+    msStyle |= SS_NOTIFY;
+

     return msStyle;
 }
 
     return msStyle;
 }
 


@@ -132,36 +139,115 @@ wxSize wxStaticText::DoGetBestSize() const
     wxFont font(GetFont());
     if (!font.Ok())
         font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     wxFont font(GetFont());
     if (!font.Ok())
         font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

-    
+

     dc.SetFont(font);
 
     wxCoord widthTextMax, heightTextTotal;
     dc.SetFont(font);
 
     wxCoord widthTextMax, heightTextTotal;

-    dc.GetMultiLineTextExtent(GetLabel(), &widthTextMax, &heightTextTotal);
+    dc.GetMultiLineTextExtent(GetLabelText(), &widthTextMax, &heightTextTotal);

 
 #ifdef __WXWINCE__
     if ( widthTextMax )
         widthTextMax += 2;
 #endif // __WXWINCE__
 
 
 #ifdef __WXWINCE__
     if ( widthTextMax )
         widthTextMax += 2;
 #endif // __WXWINCE__
 

-    return wxSize(widthTextMax, heightTextTotal);
+    // border takes extra space
+    //
+    // TODO: this is probably not wxStaticText-specific and should be moved
+    wxCoord border;
+    switch ( GetBorder() )
+    {
+        case wxBORDER_STATIC:
+        case wxBORDER_SIMPLE:
+            border = 1;
+            break;
+
+        case wxBORDER_SUNKEN:
+            border = 2;
+            break;
+
+        case wxBORDER_RAISED:
+        case wxBORDER_DOUBLE:
+            border = 3;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown border style") );
+            // fall through
+
+        case wxBORDER_NONE:
+            border = 0;
+    }
+
+    widthTextMax += 2*border;
+    heightTextTotal += 2*border;
+
+    wxSize best(widthTextMax, heightTextTotal);
+    CacheBestSize(best);
+    return best;

 }
 
 void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
 }
 
 void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {

-    // we need to refresh the window after changing its size as the standard
-    // control doesn't always update itself properly
+    // note: we first need to set the size and _then_ call UpdateLabel

     wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
 
     wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
 

+#ifdef SS_ENDELLIPSIS
+    // do we need to ellipsize the contents?
+    long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ( !(styleReal & SS_ENDELLIPSIS) )
+    {
+        // we don't have SS_ENDELLIPSIS style:
+        // we need to (eventually) do ellipsization ourselves
+        UpdateLabel();
+    }
+    //else: we don't or the OS will do it for us
+#endif // SS_ENDELLIPSIS
+
+    // we need to refresh the window after changing its size as the standard
+    // control doesn't always update itself properly

     Refresh();
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
     Refresh();
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-    wxStaticTextBase::SetLabel(label);
+#ifdef SS_ENDELLIPSIS
+    long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ( HasFlag(wxST_ELLIPSIZE_END) &&
+          wxGetOsVersion() == wxOS_WINDOWS_NT )
+    {
+        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
+        // newline handling in static texts: the newlines in the labels are
+        // shown as square. Thus we don't use it even on newer OS when
+        // the static label contains a newline.
+        if ( label.Contains(wxT('\n')) )
+            styleReal &= ~SS_ENDELLIPSIS;
+        else
+            styleReal |= SS_ENDELLIPSIS;
+
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal);
+    }
+    else // style not supported natively
+    {
+        styleReal &= ~SS_ENDELLIPSIS;
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal);
+    }
+#endif // SS_ENDELLIPSIS
+
+    // this call will save the label in m_labelOrig and set it into this window
+    // (through wxWindow::SetLabel)
+    m_labelOrig = label;
+
+#ifdef SS_ENDELLIPSIS
+    if ( styleReal & SS_ENDELLIPSIS )
+        DoSetLabel(RemoveMarkup(label));
+    else
+#endif // SS_ENDELLIPSIS
+        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 ( !HasFlag(wxST_NO_AUTORESIZE) &&
+         !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!

     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,


@@ -169,14 +255,13 @@ void wxStaticText::SetLabel(const wxString& label)
     }
 }
 
     }
 }
 

-

 bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled
 bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled

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

     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,


@@ -186,4 +271,17 @@ bool wxStaticText::SetFont(const wxFont& font)
     return ret;
 }
 
     return ret;
 }
 

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

 #endif // wxUSE_STATTEXT
 #endif // wxUSE_STATTEXT