Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-08 23:26:18 +00:00
parent c18ecb1164
commit c0ed460c2e
106 changed files with 535 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/button.cpp
View File

@@ -87,7 +87,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
// Subclass again for purposes of dialog editing mode
SubclassWin((WXHWND)wx_button);
SetFont(* parent->GetFont());
SetFont(parent->GetFont());
SetSize(x, y, width, height);
ShowWindow(wx_button, SW_SHOW);
@@ -117,7 +117,7 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
int cyf;
char buf[300];
GetWindowText((HWND) GetHWND(), buf, 300);
GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
GetTextExtent(buf, &current_width, &cyf,NULL,NULL,& GetFont());
// If we're prepared to use the existing width, then...
if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
@@ -126,7 +126,7 @@ void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags)
{
int cx;
int cy;
wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
wxGetCharSize(GetHWND(), &cx, &cy,& GetFont());
actualWidth = (int)(current_width + 3*cx) ;
}