Updated font dialog constructors to use a reference to the font data

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 238c9ce24300df6dccc7ca00054e2f8a3ab23264..4b33ade2c9a456f27b5d49dd089b6528087737b2 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:


@@ -82,13 +82,6 @@ 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);
 
   wxControl::SetFont(parent->GetFont());
   SubclassWin(m_hWnd);
 
   wxControl::SetFont(parent->GetFont());


@@ -141,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


@@ -168,15 +170,16 @@ bool wxStaticText::SetFont(const wxFont& font)
     return ret;
 }
 
     return ret;
 }
 

-

 long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 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
 #endif // wxUSE_STATTEXT