Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -200,9 +200,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
|
||||
|
||||
SubclassWin(GetHWND());
|
||||
|
||||
if ( parent->GetFont() && parent->GetFont()->Ok() )
|
||||
if ( parent->GetFont().Ok() && parent->GetFont().Ok() )
|
||||
{
|
||||
SetFont(* parent->GetFont());
|
||||
SetFont(parent->GetFont());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -328,7 +328,7 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
|
||||
int cx; // button font dimensions
|
||||
int cy;
|
||||
|
||||
wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
|
||||
wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
|
||||
|
||||
int control_width, control_height, control_x, control_y;
|
||||
|
||||
|
Reference in New Issue
Block a user