cast corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 82bf84e6dfab906e34e90432eeb082a248b2d3f1..f0893d9cb5b50619c0053de3c0aa49207b866228 100644 (file)
--- 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 563960faea63a744c0096f2bedb011c44d05e7ac..a611b10314bba657c661801895dc8bfd1d6c8838 100644 (file)
--- 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