X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..bfac8499858dbb52ae4e712b718dcd08e777b4c2:/src/msw/stattext.cpp?ds=sidebyside

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 5c9a0cfea5..d8308232ea 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -79,7 +79,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static ctrl" );
 
-#if CTL3D
+#if wxUSE_CTL3D
 /*
   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
     Ctl3dSubclassCtl(static_item);
@@ -94,7 +94,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
-void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticText::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -111,12 +111,11 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
   int actualWidth = width;
   int actualHeight = height;
 
-  char buf[300];
   int current_width;
   int cyf;
 
-  ::GetWindowText((HWND) GetHWND(), buf, 300);
-  GetTextExtent(buf, &current_width, &cyf, NULL, NULL, & GetFont());
+  wxString text(wxGetWindowText(GetHWND()));
+  GetTextExtent(text, &current_width, &cyf, NULL, NULL, & GetFont());
 
   int ww, hh;
   GetSize(&ww, &hh);
@@ -145,14 +144,13 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-  int w, h;
-  RECT rect;
-
   wxWindow *parent = GetParent();
+
+  RECT rect;
   GetWindowRect((HWND) GetHWND(), &rect);
 
-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
+  // Since we now have the absolute screen coords, if there's a parent we must
+  // subtract its top left corner
   POINT point;
   point.x = rect.left;
   point.y = rect.top;
@@ -161,9 +159,9 @@ void wxStaticText::SetLabel(const wxString& label)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
   }
 
+  int w, h;
   GetTextExtent(label, &w, &h, NULL, NULL, & GetFont());
-  MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h,
-             TRUE);
+  MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h, TRUE);
   SetWindowText((HWND) GetHWND(), (const char *)label);
 }
 
@@ -171,7 +169,7 @@ WXHBRUSH wxStaticText::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 /*
-#if CTL3D
+#if wxUSE_CTL3D
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);