X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/719ee9c389634c6e51908b8a298884df520c196b..822e690b221486b63895b5f14a7fbee2bc966fe5:/contrib/src/stc/stc.cpp.in?ds=sidebyside

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index a52798705e..6e626e3bef 100644
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -168,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
+
+    SetBestFittingSize(size);
 }
 
 
@@ -529,10 +531,7 @@ void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
 
 
 void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {
-#ifdef __WXMAC__
-    if (! (IsBeingDeleted() || GetParent()->IsBeingDeleted()))
-#endif
-        m_swx->DoLoseFocus();
+    m_swx->DoLoseFocus();
     evt.Skip();
 }
 
@@ -569,6 +568,14 @@ void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
 }
 
 
+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events