always let the multiline text control process the Enter key presses

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 82b2a21745f6b264a6a6d79d535e56f1a1012d5e..1c0810694c1ed5be5834f28b96fcdd23aa61e728 100644 (file)
--- 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:
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:


@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_STATTEXT
+

 #ifndef WX_PRECOMP
 #include "wx/event.h"
 #include "wx/app.h"
 #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;
 
 
   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)
   if (m_windowStyle & wxALIGN_CENTRE)
     msStyle |= SS_CENTER;
   else if (m_windowStyle & wxALIGN_RIGHT)


@@ -77,16 +82,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static ctrl") );
 
 
   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);
 
   SubclassWin(m_hWnd);
 

-  SetFont(parent->GetFont());
+  wxControl::SetFont(parent->GetFont());

   SetSize(x, y, width, height);
 
   return TRUE;
   SetSize(x, y, width, height);
 
   return TRUE;


@@ -136,9 +134,18 @@ wxSize wxStaticText::DoGetBestSize() const
     return wxSize(widthTextMax, heightTextTotal);
 }
 
     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)
 {
 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
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled


@@ -148,14 +155,19 @@ void wxStaticText::SetLabel(const wxString& label)
     }
 }
 
     }
 }
 

-long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+
+bool wxStaticText::SetFont(const wxFont& font)

 {
 {

-  // 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;
+    bool ret = wxControl::SetFont(font);

 
 

-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
+    // adjust the size of the window to fit to the label unless autoresizing is
+    // disabled
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+    }

 
 

+    return ret;
+}

 
 

+#endif // wxUSE_STATTEXT