use GetText() instead of GetText(wxString&), made some methods inline

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 82b2a21745f6b264a6a6d79d535e56f1a1012d5e..8c39245ce434dbef07a75dc9391bd94f6c079c4a 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -57,7 +57,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)


@@ -86,7 +89,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   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;


@@ -148,6 +151,22 @@ 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
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
+    }
+
+    return ret;
+}
+
+

 long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
   // Ensure that static items get messages. Some controls don't like this
 long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
   // Ensure that static items get messages. Some controls don't like this