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

cast corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-01 05:18:10 +00:00
parent 9f4b46717b
commit c6f9fb0548
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/textctrl.cpp
View File

@@ -803,11 +803,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
if ( scrollView ) if ( scrollView )
{ {
HIViewAddSubview( scrollView , textView ) ; HIViewAddSubview( scrollView , textView ) ;
m_macControl = scrollView ; m_macControl = (WXWidget) scrollView ;
} }
else else
{ {
m_macControl = textView ; m_macControl = (WXWidget) textView ;
} }
#else #else
short featurSet; short featurSet;

2
src/mac/carbon/window.cpp
View File

@@ -461,6 +461,8 @@ void wxWindowMac::Init()
wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ; wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
} }
// we need a valid font for the encodings
wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
} }
// Destructor // Destructor