X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/486fd225d4942c852b913636bdc81d9a0a27f7d5..dd23c25cde86903f2a4115e4a24e891e80d477e4:/src/msw/stattext.cpp?ds=sidebyside

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index c4a61fd113..4b33ade2c9 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/msw/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_STATTEXT
+
 #ifndef WX_PRECOMP
 #include "wx/event.h"
 #include "wx/app.h"
@@ -57,7 +59,10 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   m_windowStyle = style;
 
-  long msStyle = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ ;
+  long msStyle = WS_CHILD | WS_VISIBLE;
+
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msStyle |= WS_CLIPSIBLINGS;
   if (m_windowStyle & wxALIGN_CENTRE)
     msStyle |= SS_CENTER;
   else if (m_windowStyle & wxALIGN_RIGHT)
@@ -77,13 +82,6 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static ctrl") );
 
-#if wxUSE_CTL3D
-/*
-  if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
-    Ctl3dSubclassCtl(static_item);
-*/
-#endif
-
   SubclassWin(m_hWnd);
 
   wxControl::SetFont(parent->GetFont());
@@ -136,9 +134,18 @@ wxSize wxStaticText::DoGetBestSize() const
     return wxSize(widthTextMax, heightTextTotal);
 }
 
+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
+    wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
+
+    Refresh();
+}
+
 void wxStaticText::SetLabel(const wxString& label)
 {
-    SetWindowText(GetHwnd(), label);
+    wxStaticTextBase::SetLabel(label);
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled
@@ -163,15 +170,16 @@ bool wxStaticText::SetFont(const wxFont& font)
     return ret;
 }
 
-
 long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-  // Ensure that static items get messages. Some controls don't like this
-  // message to be intercepted (e.g. RichEdit), hence the tests.
-  if (nMsg == WM_NCHITTEST)
-    return (long)HTCLIENT;
-
-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+    // Ensure that static items get messages. Some controls don't like this
+    // message to be intercepted (e.g. RichEdit), hence the tests.
+    // Messes up display with Windows XP, apparently, so have to
+    // do explicit hit-testing in wxWindowMSW.
+#if 0
+    if (nMsg == WM_NCHITTEST)
+        return (long)HTCLIENT;
+#endif
+    return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
-
-
+#endif // wxUSE_STATTEXT