From c6f9fb054849dd09b99aeaad9b10b4a12eca0752 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 1 Apr 2004 05:18:10 +0000 Subject: [PATCH] cast corrected git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/textctrl.cpp | 4 ++-- src/mac/carbon/window.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 82bf84e6df..f0893d9cb5 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -803,11 +803,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, if ( scrollView ) { HIViewAddSubview( scrollView , textView ) ; - m_macControl = scrollView ; + m_macControl = (WXWidget) scrollView ; } else { - m_macControl = textView ; + m_macControl = (WXWidget) textView ; } #else short featurSet; diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 563960faea..a611b10314 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -461,6 +461,8 @@ void wxWindowMac::Init() wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ; } + // we need a valid font for the encodings + wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } // Destructor -- 2.47.2