- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- int x1 = x;
- int y1 = y;
-
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
-
- AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
- int actualWidth = width;
- int actualHeight = height;
-
- char buf[300];
- int current_width;
- int cyf;
-
- ::GetWindowText((HWND) GetHWND(), buf, 300);
- GetTextExtent(buf, ¤t_width, &cyf, NULL, NULL,GetFont());
-
- int ww, hh;
- GetSize(&ww, &hh);
-
- // If we're prepared to use the existing width, then...
- if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
- actualWidth = ww;
- else if (width == -1)
- {
- int cx;
- int cy;
- wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
- actualWidth = (int)(current_width + cx) ;
- }
-
- // If we're prepared to use the existing height, then...
- if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
- actualHeight = hh;
- else if (height == -1)
- {
- actualHeight = (int)(cyf) ;
- }
-
- MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+ wxClientDC dc(const_cast<wxStaticText *>(this));
+ wxFont font(GetFont());
+ if (!font.IsOk())
+ font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ dc.SetFont(font);
+
+ wxCoord widthTextMax, heightTextTotal;
+ dc.GetMultiLineTextExtent(GetLabelText(), &widthTextMax, &heightTextTotal);
+
+#ifdef __WXWINCE__
+ if ( widthTextMax )
+ widthTextMax += 2;
+#endif // __WXWINCE__
+
+ // It looks like the static control needs "slightly" more vertical space
+ // than the character height and while the text isn't actually truncated if
+ // we use just the minimal height, it is positioned differently than when
+ // the control has enough space and this result in the text in edit and
+ // static controls not being aligned when the controls themselves are. As
+ // this is something you really should be able to count on, increase the
+ // space allocated for the control so that the base lines do align
+ // correctly. Notice that while the above is true at least for the single
+ // line controls, there doesn't seem to do any harm to allocate two extra
+ // pixels in multi-line case neither so do it always for consistency.
+ //
+ // I still have no idea why exactly is this needed nor why should we use 2
+ // and not something else. This seems to work in all the configurations
+ // though (small/large fonts, different OS versions, ...) so just hard code
+ // it for now. If we need something better later it might be worth looking
+ // at the height of the text control returned by ::GetComboBoxInfo() as it
+ // seems to be the "minimal acceptable" height.
+ heightTextTotal += 2;
+
+ return wxSize(widthTextMax, heightTextTotal);